fixing unit tests.