VID-2079 updating unit tests