Keeping tests of same type in same group