Pooja/Melanie | #0000 | Fixing tests