Fix again unit tests.