Improve tests for NLO-C topology