Remove unneeded if statements, as return sig matches with calling function
Pass environment into EnvMap
Add a test for EnvMap