Add first few scoreboard tests and logic