Fixed breaking unit tests.