Fixed a stupid interpolation bug (and changed the interpolation approach completely).
Modified test scripts.