Bug 798480 - Fix SUT tests. r=wlach