Before merge:
- version that is working on the "simple" examples.
- cut the test file into a test suite