Renamed a method in player and added more tests