refactored to improve coverage
improve CommentsDb coverage
Merge branch 'master' into Issue2002
[2002] Clean up CommentsDb

fixes #2002