refactoring claimant_spec