Fix the unit tests.