Setting up testing and cleaning up code for the scoreboard