Filled in tests in PlayerTests. Small changes to Player as well.