Fixed interpolation and added test