Rebased #401

Added tests for scoreboard and ambassadors views, fixed a few typos by @ialja