* Fix tracking for search * Fix flacky test passing * Improving test code, trying to use official types for HandlerInfo * Revert adding dependencies