am 1ad30006: Fixing unit tests to pass when run.

* commit '1ad3000647abb4e86484f68aa387def88294d82b':
  Fixing unit tests to pass when run.