More searches and tests