integrating 2D interpolation and adding tests