Added search methods and tests