Remove hardcoded ids and cleanup in RemoveClaimsTest

Change-Id: Ib592be4f9ea52e9759800aeaee12d97d867494a3
Merge "Remove hardcoded ids and cleanup in RemoveClaimsTest"