All tests passing

Dodgy data setup though.