fix some test failures