Added test for Player and made minor adjustments in concerned classes