Fix the test cases. Do not be too conservative