support procedure definition by xml, update test code