DDF-157: Fixed test ordering issue that was causing test failure.