Refactor wsdl class mapper and its test