added more tests to the comment model
added more tests to the comment model
fixed merge conflicts