Added more tests for the state-machines
solved merge conflicts
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop