improved interpolation
cleanup tests