fix tests after c60be9129be22495