tests: ensure test suite is tidied up
Merge pull request #1455 from matthewrmshin/tidy-up-after-a-test

tests: ensure test suite is tidied up