Commit 40ab4d7 breaks a unit test. The code was shifted in consequence.