Minor fixes and update test to new support a conversational RPC exchange.