Fix bad import in test
refactored interpolation
test passing