fix tests after 30761584d08da92d5415920ef97a1faf20880000. v2