Refactor to allow tests to be duplicated for xml pickles.
Refactor to allow tests to be duplicated for xml pickles.


ioam/svn-history,ioam/svn-history,ioam/svn-history,ioam/svn-history,ioam/svn-history