better structure of test suites