Bug 1022098 - Follow-up, rename and fix tests

https://bugzilla.mozilla.org/show_bug.cgi?id=1022098