[test] fix refactorings in tests

parent fd814407
Pipeline #6590 canceled with stages
in 528 minutes and 9 seconds