tests improved, peer_map passes