Merge AddPeer and RemovePeer logic
Adding integration test for changing peerset