Fix test cases to match newly corrected code.