Solver tests

Reworking Solver testing
:+1:  I like these