Made test use sanity check for solution
Merge branch 'solver-test' into solver-fix
Factored out error message, removed annotation for inner function