Fixes failing unit tests.