My PR was focuses just in changes to solve the jenkins problems, so I don't pay attention to this. However, I think that probably a good idea to apply factorization to each .test we touch in a PR. In this sense, I will try to factorize the 8 .test in this PR.