Improvment to Test Case