Adding Environment tests
Rename some descriptions