Expanded non regression tests for #1569