Moar tests

Three cheers for room on the train!