Fix/itests for ncl