Bug 1022098 - Follow-up, rename and fix tests r=me
Merge pull request #21133 from KevinGrandon/bug_1022098_fix_test_naming

Bug 1022098 - Follow-up, rename and fix tests