Add p.core.version-dispatch-test
Make fixing agent forwarding a TODO