Improve NLO-C tests