Fix tests and searching in current