Fix some test cases I broke in r181552