Fix some itest dependency resolution issues.