Add simple test suite, more work on solver