testSuites refactoring