Correcting some failing unit tests.