Fix remaining unit tests.