benchmark: reland test refactoring #31755
+494
−744
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.