Work on fixing unit tests.