Clearer grouping of tests