Fixed another merge-break in the unit tests.