Fix pickling
Fix interpolation test
PEP 8 fix to "Fix pickling"