Fixes for failures in claim spec

Mostly renaming data fields in test data