MODE-1624 - Added a couple of test cases which attempt to reproduce the issue