Fix up unit tests.