Fix two more problems in the unit tests.