Cleaning up failing test cases