- Fix code changed by merge
- Fixed return statement on global scope
- Temporary fix to tests that are hanging forever