fix source checking in claim and related rspec