Tidy up tests.
Merge remote-tracking branch 'errietta/feature--clean_tests'