refactored claim class, new test cases for claim