Added tests to reproduce issue