Fix up test cases