Better grouping for tests.