Merge "Move ARP test functionality to ArpPeer"