Fix bug + compilation bug

- Work in progress in TreeRecomposerTest
Merge branch 'master' of https://github.com/aghosn/persistence