refactored tests to use Core:Environment