Removed test case class redundancy