bug fix and TestPlayer