Modified test case class names and add code comments