cleanup test cases

cleanup