cleanup tests organization in suites