"Fixed" unit tests again

Also added fix for treeifier when node has already been spilled.