fix test because controller no longer does 2 moves at once
pass gametype in params
refactor controller and add ability to play different game types