Cleanup PATCH Claim Tests

This makes the PATCH claim tests more explicit.

Tests: bug#1200664
Change-Id: Icac834b4b621dac92afdc5f8e6c8fe609f5f300e
Merge "Cleanup PATCH Claim Tests"