[DF-3071] Hotfix for Unit tests. Also added GameController framework.