fix up test cases