Fixed interpolation and one test.