Bug 816610 - Fix unit tests
Merge pull request #8144 from KevinGrandon/bug_841251_fix_unit_tests

Bug 816610 - Just fixing tests, r=me.