Refactor SetClaimTest

This means each test case actually runs as
a seperate test meaning we can get seperate
output for each!

Change-Id: Iab6dcd8f757febdda07c542d2a90c6072673c2b7
Merge "Refactor SetClaimTest"