main test classes & suites refactoring