added dcl support
changed testing a bit, to setup each time new object.