if a test fails or exits with an error, run cleanup as a precaution
Merge pull request #409 from cdburkard/patches/cleanup_tests

if a test fails or exits with an error, run cleanup as a precaution