change: use the term xml instead of wsdl

Want to transform other types of xml such as xsd so now use the term xml
instead of wsdl.
test: expected files grouped by service
feature: add Merchant Data
fix: ensure elements in choose are found