Fixed up test cases