More refactoring of test-suite