Cleanup in ClaimModificationHelperTest

Change-Id: I586f974611dac5cdfdc085760c23422e394bb9e1
Merge "Cleanup in ClaimModificationHelperTest"