ENG-5540 addressed Ning's comments(adding description to variable) and added test cases