Reformat in wsdl class mapper and test