Bug 1022098 - Follow-up, rename and fix tests r=me