Fixes #358
- Upgrade version - Re-enable in travis.yml - Move mocks to contracts folder for instrumentation