Fix minor issues to get Thunderbird's version of these tests passing.