Upgrade ddr-models dependency to 1.6.0 and fix tests as needed; closes #...

...1234