Continue refactoring of the test
module
#10553
Merged
Loading
test
module
#10553