Cleanup SetClaimTest

Change-Id: I586674730f196806d9fe7a1a1691f0d640499230
Merge "Cleanup SetClaimTest"