fix other unit test failures