Fixed all the tests that we broke, using @variables to track player names