Resolved several issues with integration tests.

All 569u, 312/330i tests pass.