TESTING: Fix NCD testing harness