Hi @vincenzopalazzo,
IMO the change of the same issue in different PR is very confusing for the people that will make a review, and also work in a different file.
As discussed in this issue #23135#pullrequestreview-771245637 I will make all the changes in one PR in the different commit, however some review of the works is very welcome.
P.S: The PR will include also an additional method inside the test framework, to know more you can look inside #23127
Originally posted by @vincenzopalazzo in #23119 (comment)