Fix to ncd test