Added game to models
Refactored board and test