still fixing unit test failures