Updated claim repository methods and accompanying unit tests. All pass for the Data tests.