Remove duplication of test cases