Dc/Melanie |#3870| fixing tests