{Commenting Service] Added query for comment & Tests
and other minor improvements