[test-refactoring] Test suite organization