fixed failing unit tests.