am 3ca9d009: Merge "Fixing unit tests to pass when run."

* commit '3ca9d0096f5618f5bbad8b1363a069d13fc3026e':
  Fixing unit tests to pass when run.