More robust solvers for end-to-end testing.