Fix/vnmapper itest