Added some testing, and fixed the Solver