Adding Environment tests
Rename some descriptions
Merge branch 'develop'