Adding context id to environment
Adding test for environment contextId
Merge pull request #2 from jonsu/feature/environment-context-id

Adding context id to environment.