Updates for environment tests
Updates for formatting