a massive refactoring of the TestSuite.