Fixed the env locators
Merge pull request #489 from kbidarkar/fix-envtests

Fixed the env locators