Issue 6084 testcases