Fix some more errors in unit tests.