Add search utility ; Add unittest for search