Fix some doc and tests in Ludovic's code.