old test case that was merged in by mistake
Merge branch 'hotfix/merge-problem'