tested except for new ClaimGenerator impl