Improve random game test
Merge branch 'master' into backwards