cleanup solver code
new test