Fix NCD conversion tests