Add search with tests