Additional Scoreboard Unit tests + bug  fix