C#: Re-arrange the code in constructor data flow test and update expected output.

Author: michaelnebel

csharp/ql/test/library-tests/dataflow/fields/C_ctor.cs

@@ -1,42 +1,40 @@
-public class C_no_ctor
+public class Constructors
 {
-    private Elem s1 = Util.Source<Elem>(1);
-
-    void M1()
+    public class C_no_ctor
     {
-        C_no_ctor c = new C_no_ctor();
-        c.M2();
+        private object s1 = Source<object>(1);
+
+        void M1()
+        {
+            C_no_ctor c = new C_no_ctor();
+            c.M2();
+        }
+
+        public void M2()
+        {
+            Sink(s1); // $ hasValueFlow=1
+        }
     }
 
-    public void M2()
+    public class C_with_ctor
     {
-        Util.Sink(s1); // $ hasValueFlow=1
-    }
-}
+        private object s1 = Source<object>(1);
 
-public class C_with_ctor
-{
-    private Elem s1 = Util.Source<Elem>(1);
+        void M1()
+        {
+            C_with_ctor c = new C_with_ctor();
+            c.M2();
+        }
 
-    void M1()
-    {
-        C_with_ctor c = new C_with_ctor();
-        c.M2();
-    }
+        public C_with_ctor() { }
 
-    public C_with_ctor() { }
-
-    public void M2()
-    {
-        Util.Sink(s1); // $ hasValueFlow=1
+        public void M2()
+        {
+            Sink(s1); // $ hasValueFlow=1
+        }
     }
-}
 
-class Util
-{
     public static void Sink(object o) { }
 
     public static T Source<T>(object source) => throw null;
 }
-
-public class Elem { }