Another fix to the unit tests.