Tidy up non-linear solver energy norm convergence test

Tracker item: 3497