implemented missing tests and solver.