Fixed callback usage in ClaimDiffer and added tests

Change-Id: If5ce08ebc18eabe4dade567a88bbefc9aa215ff4
Merge "Fixed callback usage in ClaimDiffer and added tests"