Moving tests into groups