better grouping of tests