Fix weaved unit tests
am: f1a77fcb46

* commit 'f1a77fcb460c16e690306ea1e296d26ba7b90da2':
  Fix weaved unit tests