Improve NLO-D tests