Fixed some failing unit tests.