cleanup of test case support