Updated the code to be compliant with the PSR coding standards/style
Added some tests for the Env class