Bug 826381 - Update more tests to go with cset 11f420dd6b47. r=fix-test