Added enhanced test case class