Fix and test interpolation. Issue #43