Moar tests
Tidy ups