refactored game a bit and added comments to tests