moving claimant type from claimant to claim model, fixing all tests, pending submit_claim tests