added more tests and consolidated into a few public methods in the Player class.