* Handle cases where the data type is hex encoded, but the data is
not actually hex encoded.
* Test data claims 4x, but is not hex encoded
* Encode the private string
* Replace 4x|<private> with 3C707269766174653E
* Re-run save test data.
Seems some of these files might have been hand edited at some point
as fields seem out of order
* Have a trap test use a mock instead of a db query
3838549748