Fix some tests
Fix environment renaming