DC| #000 |Fixing tests