Begin shift to using Builder and FactoryGirl for XML documents