Better 1D proxy, new 1D tests, small tree fix.