Updated test and player class methods