Add further tests for ChangeOpClaimRemove

Change-Id: If7aa688843934a5a0411656aec236d7a79e7eb78
Merge "Add further tests for ChangeOpClaimRemove"