Adjusted test cases, which were broken because of issue 6406