Fixes to interpolate methods & tests