VID-1976 fixing unit tests