fix xfail and make nesting work by avoiding to reset
the unpickling context in the custom handlers.