Minor fixes for Environment tests.