Merge "Incorporated reviewer's comment on the Unit tests."