Restructured env tests with @kelsin