Bug 854840 - Follow-up bug 852924 to fix unit tests
Merge pull request #8822 from crdlc/bug-854840

Bug 854840 - Follow-up bug 852924 to fix unit tests