Fixing failing unit tests.