Fix up unified search unit tests