[PATCH 0/2] genericxml2xmltest: Refactor test calls