consul/agent: Fix failing tests due to struct changes