Fixed failing unit tests.