more group L/D tests, move some code around