DocumentService coverage, refactoring