Fix CSharpOutputTests due to recent LINQ where changes