Fix master branch and add a unit test with lastState

A bug has been fixed and an extra dummy solver with a unit test has been added.