Bug 965371 - Follow-up: test and misc fixes. r=me