Make TestChanges compatible to DataModel 1.0

Change-Id: Iaa2ea314b3b9f751fcedbcb2b2017d75088a1304
Merge "Make TestChanges compatible to DataModel 1.0"