Dc/Melanie |#0000| Fixing test