Started fixing unit tests.