Bug 985492 - Follow up to fix tests. r=bhearsum