[#1789] Added tests for #1789