Changed init values for Player, corrected a few mistakes and corrected tests accordingly