am ee8ebeec: Merge "Fix unit tests"

* commit 'ee8ebeecbf80b9cccc5569570112634b49c45b53':
  Fix unit tests