Minor refactoring that fixes a TODO. Moving the construction of the TestEnvironment from a static method to the constructor of the class itself.
Merge pull request #159 from chaitanyagurrapu/refactorTestEnvironment

Minor refactoring that fixes a TODO.
Fixes #156
Small formatting change