DC | #0000 |Fixing tests