Fixed up test cases, all tests passing