added more searches and tests