Fix some unit tests.