Renaming tests to use only with environment
Fixing broken tests
Merge pull request #12 from caelum/ot-fixing-broken-tests-env

Fixing broken tests from #10