Fixed some integration-test issues.

All 661u, 339i tests pass.