Added Comment.scala and also in the test