Adding a few tests.
Adding catches to prevent run-away solvers.