Updated Search and tests