TESTS - Add ClubGen - Fix other gens