clean up Environment, update tests
update name of test