Refactored Game to be enable unit tests