refactor tests
Use member objects for game