Fix some failing unit tests.