add comment model tests and fix bugs with comments