Solver tests

Reworking Solver testing