Support marshalling step macro steps to XML, add step macro testing to mock suite