tests: ensure test suite is tidied up

This ensures that the test suite is tidied up.