Added Game tests, refactoring