complete claim view, working on claim tests
resolve merge conflict