Improve NLO-E tests