Refactor and add test for CommentReport