Make tests compatible with DataModel 1.0

Basically, do not add Claim objects to Items. Use Statement objects.

Change-Id: I7a4aaf0c0da0077bfac3d55f4c4225ee3cb96b9a
Merge "Make tests compatible with DataModel 1.0"