Fix up test code mess.