added claimant and claim classes and test