Improve NLO-G tests