Port test_p2e2p to use expansion toys
#278
+50
−136
Draft