refactor ValidatorTestSuite.