Minor refactoring in testing DOCS-147