WIP

I'm not sure I understand why the test case fails sometimes.