Fixing a couple more things in tests:
- schema was broken by my RPC conversions
- reparent doesn't need special casing, 2m timeout is default.