Refactoring tests according new creation of environment