some cleanup in test cases