Still have errors with incorrect data assignment in InterpolationTest, but a few things were fixed on the way.