Better tests for DOCS-78