Added 2D/3D spline alternatives, fixed some tests