Refactor NL tests to test multiple solvers