Prepare for test refactor & pymerge.data.tree interface modification