Merge "Improvment to Test Case"