Minor cleanup in ClaimsTest