Cleaning up testcases