Refactor PeerFinder and Unit Tests