More changes to Player and Player Test.