Tests cleanup
Prevent infinite splitting of the tree
More tests