Move logic to get claim to ClaimModificationHelper

for great testability!!

Change-Id: Id590af58351290bd2298d6090d99b51b7edaaf5b