Improve NLO-C tests
Improve NLO-d tests