TestPlayer improved