updated solver, solver test working again