Refactored fuel tank tests
refactored game states and first cut of the scoreboard