Fixed integration test issues.