More tests, re-working Spline classes