repaired a few more tests
restored solver class
fixed solve1 test case
fixed solve2 test