Add groups generation to fixtures