Improve order of tests for convergence.