Modernize SetClaimTest

This should help making this more compatible with DataModel 1.0.

Change-Id: Ieef0ef3324c2bced7eb7ca9e07ba1fca3803eb96
Merge "Modernize SetClaimTest"