test case fix
merge