Melanie/DC | #2915 | Fixing tests