am 9c051c78: Merge "Incorporated reviewer\'s comment on the Unit tests."

* commit '9c051c782b966c15dfebe2349336d89bb217c0f8':
  Incorporated reviewer's comment on the Unit tests.