Ajay|DC | #0000 | Fixing functional tests - remove multiple uses of same ds from different tests