cleanup of test code