Improve NLO-gg-CD tests