Merge pull request #3665 from ilandikov/test-better-renderer-coverage

Merge pull request #3665 from ilandikov/test-better-renderer-coverage #1141