Bug 1102416 followup: fix tests, r+a=gavin