improved game class and refactored tests