Melanie/Pooja|#2666| Fixing mangrove unit tests