Fix broken unit tests.