Bug 876623 - Add some tests for bug 867045
Merge pull request #10077 from crdlc/bug-offline-unit-tests

Bug 876623 - Add some tests for bug 867045