Fix test cases, take 2.