Issue #21625: Cleaned up picker tests