fixed test cases to work with new API changes introduced by the Environment concept