fix some unit test failures