More table tests
Move Scoreboard into header