updated tests, working on solver