DDF-82: Fix test failures