Fixes unit tests.
Fixes unit tests.