Fix tests
Fix tests
Fix tests
Fix tests
Refactor tests
Refactoring
Add global environment
Add and/or to global environment