Comment out some test cases