Added a few more helpers and test for GameController