DC | #3449 | Fixing tests