Fix test cases failing incorrectly