refactor claimant and claim specs to deal with num_claimants