Bug 893284 - Fix ds-test to work with composite support removed.