Correcting TreeRecomposerTest

- Works, but some ordering problems in the names
Bugfix in the Recomposer

..But still one ou there
Merge branch 'master' of https://github.com/aghosn/persistence