bugfix

Signed-off-by: Stéphane Depierrepont <toorop@toorop.fr>
add new tests

Signed-off-by: Stéphane Depierrepont <toorop@toorop.fr>