Search form modified and tests added