ScoreBoardTest updates and fixes