Analysis of data from group-randomized trials with repeat observations on the same groups