DMR: fix another failing test to use the new data model
Merge remote-tracking branch 'origin/dev' into dev