Add test to comments
Fix merge conflicts
Fix comments test