Fix misplaced testcase() macros from the previous check-in.