Issue #78 : add more tests