Refactor Environment
More util tests
Still not sure how to implement env
Add some more tests