Issue #73 : Integration tests improved