Tidy up tests.
WIP