Testcase bugfix
Fix Merge