Fix more itest dependency resolution issues.