VID-2004 fixing unit tests