Updated the Player class, added some test, and clean up some debug spam