fixing tests; making interpolator generic