Added actual test to SolverTest
Renamed testModel to simpleModel in test classes
Separated testing methods from models to test