unpickling error handling
fix merge conflicts
unittests fixes