adding search/peer_map and test