Fix mock to accept new agent URI style