Comment and CommentTest added