Fixed the failing unit tests.