VID-1308 updating unit tests