Improve NLO-C tests
Improve NLO-G tests
Improve NLO-F tests