Fix failing unit tests.

Author: nojaf

tests/fsharp/typecheck/sigs/neg59.bsl

@@ -21,9 +21,9 @@ neg59.fs(49,15,49,27): typecheck error FS3090: An if/then/else expression may no
 
 neg59.fs(56,15,56,27): typecheck error FS3090: An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead.
 
-neg59.fs(63,15,63,27): typecheck error FS3163: 'match' expressions may not be used in queries
+neg59.fs(63,15,63,20): typecheck error FS3163: 'match' expressions may not be used in queries
 
-neg59.fs(69,15,69,27): typecheck error FS3163: 'match' expressions may not be used in queries
+neg59.fs(69,15,69,20): typecheck error FS3163: 'match' expressions may not be used in queries
 
 neg59.fs(76,15,76,18): typecheck error FS3146: 'try/with' expressions may not be used in queries
 

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/QueryExpressions/E_MismatchedConditionalBranches01.fs

@@ -1,6 +1,6 @@
 // #Conformance #DataExpressions #Query #Regression
 // DevDiv:196007, this used to throw
-//<Expects status="error" span="(8,13-8,25)" id="FS3163">'match' expressions may not be used in queries$</Expects>
+//<Expects status="error" span="(8,13-8,18)" id="FS3163">'match' expressions may not be used in queries$</Expects>
 
 let x =
     query { 

tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/QueryExpressions/E_MismatchedConditionalBranches02.fs

@@ -1,5 +1,5 @@
 // #Conformance #DataExpressions #Query #Regression
-//<Expects status="error" span="(6,14-6,26)" id="FS3163">'match' expressions may not be used in queries$</Expects>
+//<Expects status="error" span="(6,14-6,19)" id="FS3163">'match' expressions may not be used in queries$</Expects>
 
 let q10 =
      query { for i in [1..10] do 

tests/service/ParserTests.fs

@@ -76,7 +76,7 @@ match () with
 """
 
     match getSingleExprInModule parseResults with
-    | SynExpr.Match (clauses=[ SynMatchClause (resultExpr=SynExpr.ArbitraryAfterError _) ]) -> ()
+    | SynExpr.Match (clauses=[ SynMatchClause (resultExpr=SynExpr.ArbitraryAfterError _); _ ]) -> ()
     | _ -> failwith "Unexpected tree"
 
 [<Test>]
@@ -88,7 +88,7 @@ match () with
 """
 
     match getSingleExprInModule parseResults with
-    | SynExpr.Match (clauses=[ SynMatchClause (resultExpr=SynExpr.ArbitraryAfterError _) ]) -> ()
+    | SynExpr.Match (clauses=[ SynMatchClause (SynPat.Or _, _, _, SynExpr.Const _, _, _) ]) -> ()
     | _ -> failwith "Unexpected tree"
 
 [<Test>]