rerefactoring of Claim and test