Added cleanup for test cases