Add unit tests for claimDs