PRESALES-24 Added changes to Unit tests