Fix for broken ncd test