Ajay/DC | #2230 | All DS func test - Added teardown & fixed delete ds test