Fix weaved unit tests
am: e8daf0fbda

* commit 'e8daf0fbda22f0b54f4c9066368ceb511a485311':
  Fix weaved unit tests