am 28e1b9ef: Fix unit tests

* commit '28e1b9efb3914d67ba2a050681ab666b8ac9beb8':
  Fix unit tests