Reorganize tests
Run test suites separately