Make test_tree more robust
#1216
+8
−4
Merged
test_tree more robust
#1216