Fixed unit tests to support latest Weaver changes.

553/575u tests pass, all 342i tests pass.
Fixed unit tests to support latest Weaver changes.

569/575u tests pass.
Fixed unit tests to support latest Weaver changes.

All 575u tests pass.
Merge branch 'master' of https://github.com/inthefabric/Fabric