Tests for #1885 - Do not merge yet

Still investigating on the issue #1885