Cleanup of test suite code