consul: Fix failing globalRPC test
agent: agent test fixes