fixes for failures in claim spec - mostly renaming data fields in test data