Copy leaderboard test fix from AMO to Marketplace.
Merge pull request #805 from kmaglione/moar-leaderboard-fixes

Copy leaderboard test fix from AMO to Marketplace.