DC | #0000 |fixing tests