[test] some test refactorings

parent 8b0f558b
Pipeline #4599 failed with stages
in 27 seconds