yet another attempt to fix test failures