Added code to support spectators with tests