added Claims and testing