Fixed test failures caused by Weaver upgrade.

All 575u, 341i tests pass.