Multiple fixes

- Broken requires
- Fixes failing tests
- Inconsistent indentation