Various things

- Reorganizes includes to compile faster
- Adds some tests