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