refactoring
added values from website to unit test
added Solver,intermediate state