Added claim query. Added corresponding test