[Cleanup] Removed TARGET_JVM
[mono.git] / mcs / class / System.Data / Test / System.Data / DataTableTest.cs
index 444191c21ce3e2e71e71b11d740da265f1ba3d73..86dd5e737e6ed2882418e50afc78df88bf0ae4b9 100644 (file)
@@ -11,6 +11,7 @@
 
 //
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2011 Xamarin Inc. (http://www.xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using NUnit.Framework;
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlTypes;
 using System.Globalization;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
+using System.Threading;
 using System.Xml;
+
 using MonoTests.System.Data.Utils;
-using System.Collections;
+
+using NUnit.Framework;
 
 namespace MonoTests.System.Data
 {
        [TestFixture]
        public class DataTableTest :  DataSetAssertion
        {
-               string EOL = Environment.NewLine;
+               string EOL = "\r\n";
 
                [Test]
                public void Ctor()
                {
                        DataTable dt = new DataTable();
 
-                       AssertEquals("CaseSensitive must be false." ,false,dt.CaseSensitive);
-                       Assert("Col",dt.Columns != null);
-                       //Assert(dt.ChildRelations != null);
-                       Assert("Const", dt.Constraints != null);
-                       Assert("ds", dt.DataSet == null); 
-                       Assert("dv", dt.DefaultView != null);
-                       Assert("de", dt.DisplayExpression == "");
-                       Assert("ep", dt.ExtendedProperties != null);
-                       Assert("he", dt.HasErrors == false);
-                       Assert("lc", dt.Locale != null);
-                       Assert("mc", dt.MinimumCapacity == 50); //LAMESPEC:
-                       Assert("ns", dt.Namespace == "");
-                       //Assert(dt.ParentRelations != null);
-                       Assert("pf", dt.Prefix == "");
-                       Assert("pk", dt.PrimaryKey != null);
-                       Assert("rows", dt.Rows != null);
-                       Assert("Site", dt.Site == null);
-                       Assert("tname", dt.TableName == "");
-                       
+                       Assert.IsFalse (dt.CaseSensitive, "CaseSensitive must be false.");
+                       Assert.IsNotNull (dt.Columns, "Col");
+                       //Assert.IsTrue (dt.ChildRelations != null);
+                       Assert.IsNotNull (dt.Constraints, "Const");
+                       Assert.IsNull (dt.DataSet, "ds");
+                       Assert.IsNotNull (dt.DefaultView, "dv");
+                       Assert.AreEqual (string.Empty, dt.DisplayExpression, "de");
+                       Assert.IsNotNull (dt.ExtendedProperties, "ep");
+                       Assert.IsFalse (dt.HasErrors, "he");
+                       Assert.IsNotNull (dt.Locale, "lc");
+                       Assert.AreEqual (50, dt.MinimumCapacity, "mc"); //LAMESPEC:
+                       Assert.AreEqual (string.Empty, dt.Namespace, "ns");
+                       //Assert.IsTrue (dt.ParentRelations != null);
+                       Assert.AreEqual (string.Empty, dt.Prefix, "pf");
+                       Assert.IsNotNull (dt.PrimaryKey, "pk");
+                       Assert.IsNotNull (dt.Rows, "rows");
+                       Assert.IsNull (dt.Site, "Site");
+                       Assert.AreEqual (string.Empty, dt.TableName, "tname");
                }
 
                [Test]
-                public void Select ()
-                {
+               public void Select ()
+               {
                        DataSet Set = new DataSet ();
                        DataTable Mom = new DataTable ("Mom");
-                       DataTable Child = new DataTable ("Child");                      
+                       DataTable Child = new DataTable ("Child");
                        Set.Tables.Add (Mom);
                        Set.Tables.Add (Child);
                        
@@ -92,186 +96,185 @@ namespace MonoTests.System.Data
                        
                        DataColumn Col3 = new DataColumn ("Name");
                        DataColumn Col4 = new DataColumn ("Age");
-                       Col4.DataType = Type.GetType ("System.Int16");
+                       Col4.DataType = typeof (short);
                        Child.Columns.Add (Col3);
                        Child.Columns.Add (Col4);
-                       
-                       DataRelation Relation = new DataRelation ("Rel", Mom.Columns [1], Child.Columns [0]);
+
+                       DataRelation Relation = new DataRelation ("Rel", Mom.Columns [1], Child.Columns [0]);
                        Set.Relations.Add (Relation);
 
-                       DataRow Row = Mom.NewRow ();
-                       Row [0] = "Laura";
-                       Row [1] = "Nick";
-                       Mom.Rows.Add (Row);
-                       
-                       Row = Mom.NewRow ();
-                       Row [0] = "Laura";
-                       Row [1] = "Dick";
-                       Mom.Rows.Add (Row);
-                       
-                       Row = Mom.NewRow ();
-                       Row [0] = "Laura";
-                       Row [1] = "Mick";
-                       Mom.Rows.Add (Row);
-
-                       Row = Mom.NewRow ();
-                       Row [0] = "Teresa";
-                       Row [1] = "Jack";
-                       Mom.Rows.Add (Row);
-                       
-                       Row = Mom.NewRow ();
-                       Row [0] = "Teresa";
-                       Row [1] = "Mack";
-                       Mom.Rows.Add (Row);
+                       DataRow Row = Mom.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Nick";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Dick";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Mick";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Teresa";
+                       Row [1] = "Jack";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Teresa";
+                       Row [1] = "Mack";
+                       Mom.Rows.Add (Row);
 
                        Row = Mom.NewRow ();
-                       Row [0] = "'Jhon O'' Collenal'";
-                       Row [1] = "Pack";
-                       Mom.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Nick";
-                       Row [1] = 15;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Dick";
-                       Row [1] = 25;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Mick";
-                       Row [1] = 35;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Jack";
-                       Row [1] = 10;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Mack";
-                       Row [1] = 19;
-                       Child.Rows.Add (Row);
-                
-                       Row = Child.NewRow ();
-                       Row [0] = "Mack";
-                       Row [1] = 99;
-                       Child.Rows.Add (Row);
+                       Row [0] = "'Jhon O'' Collenal'";
+                       Row [1] = "Pack";
+                       Mom.Rows.Add (Row);
 
                        Row = Child.NewRow ();
-                       Row [0] = "Pack";
-                       Row [1] = 66;
-                       Child.Rows.Add (Row);
-                       
-                       DataRow [] Rows = Mom.Select ("Name = 'Teresa'");
-                       AssertEquals ("test#01", 2, Rows.Length);
+                       Row [0] = "Nick";
+                       Row [1] = 15;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Dick";
+                       Row [1] = 25;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mick";
+                       Row [1] = 35;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Jack";
+                       Row [1] = 10;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mack";
+                       Row [1] = 19;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mack";
+                       Row [1] = 99;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Pack";
+                       Row [1] = 66;
+                       Child.Rows.Add (Row);
+
+                       DataRow [] Rows = Mom.Select ("Name = 'Teresa'");
+                       Assert.AreEqual (2, Rows.Length, "test#01");
 
                        // test with apos escaped
                        Rows = Mom.Select ("Name = '''Jhon O'''' Collenal'''");
-                       AssertEquals ("test#01.1", 1, Rows.Length);
-                       
-                       Rows = Mom.Select ("Name = 'Teresa' and ChildName = 'Nick'");
-                       AssertEquals ("test#02", 0, Rows.Length);
-
-                       Rows = Mom.Select ("Name = 'Teresa' and ChildName = 'Jack'");
-                       AssertEquals ("test#03", 1, Rows.Length);
-
-                       Rows = Mom.Select ("Name = 'Teresa' and ChildName <> 'Jack'");
-                       AssertEquals ("test#04", "Mack", Rows [0] [1]);
-                       
-                       Rows = Mom.Select ("Name = 'Teresa' or ChildName <> 'Jack'");
-                       AssertEquals ("test#05", 6, Rows.Length);
-                       
-                       Rows = Child.Select ("age = 20 - 1");
-                       AssertEquals ("test#06", 1, Rows.Length);
-                       
-                       Rows = Child.Select ("age <= 20");
-                       AssertEquals ("test#07", 3, Rows.Length);
-                       
-                       Rows = Child.Select ("age >= 20");
-                       AssertEquals ("test#08", 4, Rows.Length);
-                       
-                       Rows = Child.Select ("age >= 20 and name = 'Mack' or name = 'Nick'");
-                       AssertEquals ("test#09", 2, Rows.Length);
-
-                       Rows = Child.Select ("age >= 20 and (name = 'Mack' or name = 'Nick')");
-                       AssertEquals ("test#10", 1, Rows.Length);
-                       AssertEquals ("test#11", "Mack", Rows [0] [0]);
-                       
-                       Rows = Child.Select ("not (Name = 'Jack')");
-                       AssertEquals ("test#12", 6, Rows.Length);
-                }
-                
-               [Test]
-                public void Select2 ()
-                {
+                       Assert.AreEqual (1, Rows.Length, "test#01.1");
+
+                       Rows = Mom.Select ("Name = 'Teresa' and ChildName = 'Nick'");
+                       Assert.AreEqual (0, Rows.Length, "test#02");
+
+                       Rows = Mom.Select ("Name = 'Teresa' and ChildName = 'Jack'");
+                       Assert.AreEqual (1, Rows.Length, "test#03");
+
+                       Rows = Mom.Select ("Name = 'Teresa' and ChildName <> 'Jack'");
+                       Assert.AreEqual ("Mack", Rows [0] [1], "test#04");
+
+                       Rows = Mom.Select ("Name = 'Teresa' or ChildName <> 'Jack'");
+                       Assert.AreEqual (6, Rows.Length, "test#05");
+
+                       Rows = Child.Select ("age = 20 - 1");
+                       Assert.AreEqual (1, Rows.Length, "test#06");
+
+                       Rows = Child.Select ("age <= 20");
+                       Assert.AreEqual (3, Rows.Length, "test#07");
+
+                       Rows = Child.Select ("age >= 20");
+                       Assert.AreEqual (4, Rows.Length, "test#08");
+
+                       Rows = Child.Select ("age >= 20 and name = 'Mack' or name = 'Nick'");
+                       Assert.AreEqual (2, Rows.Length, "test#09");
+
+                       Rows = Child.Select ("age >= 20 and (name = 'Mack' or name = 'Nick')");
+                       Assert.AreEqual (1, Rows.Length, "test#10");
+                       Assert.AreEqual ("Mack", Rows [0] [0], "test#11");
+
+                       Rows = Child.Select ("not (Name = 'Jack')");
+                       Assert.AreEqual (6, Rows.Length, "test#12");
+               }
+
+               [Test]
+               public void Select2 ()
+               {
                        DataSet Set = new DataSet ();
                        DataTable Child = new DataTable ("Child");
 
                        Set.Tables.Add (Child);
-                                               
+
                        DataColumn Col3 = new DataColumn ("Name");
                        DataColumn Col4 = new DataColumn ("Age");
-                       Col4.DataType = Type.GetType ("System.Int16");
+                       Col4.DataType = typeof (short);
                        Child.Columns.Add (Col3);
                        Child.Columns.Add (Col4);
-                       
-                       DataRow Row = Child.NewRow ();
-                       Row [0] = "Nick";
-                       Row [1] = 15;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Dick";
-                       Row [1] = 25;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Mick";
-                       Row [1] = 35;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Jack";
-                       Row [1] = 10;
-                       Child.Rows.Add (Row);
-                       
-                       Row = Child.NewRow ();
-                       Row [0] = "Mack";
-                       Row [1] = 19;
-                       Child.Rows.Add (Row);
-                
-                       Row = Child.NewRow ();
-                       Row [0] = "Mack";
-                       Row [1] = 99;
-                       Child.Rows.Add (Row);
+
+                       DataRow Row = Child.NewRow ();
+                       Row [0] = "Nick";
+                       Row [1] = 15;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Dick";
+                       Row [1] = 25;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mick";
+                       Row [1] = 35;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Jack";
+                       Row [1] = 10;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mack";
+                       Row [1] = 19;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mack";
+                       Row [1] = 99;
+                       Child.Rows.Add (Row);
 
                        DataRow [] Rows = Child.Select ("age >= 20", "age DESC");
-                       AssertEquals ("test#01", 3, Rows.Length);
-                       AssertEquals ("test#02", "Mack", Rows [0] [0]);
-                       AssertEquals ("test#03", "Mick", Rows [1] [0]);                 
-                       AssertEquals ("test#04", "Dick", Rows [2] [0]);                 
-                       
-                       Rows = Child.Select ("age >= 20", "age asc");
-                       AssertEquals ("test#05", 3, Rows.Length);
-                       AssertEquals ("test#06", "Dick", Rows [0] [0]);
-                       AssertEquals ("test#07", "Mick", Rows [1] [0]);                 
-                       AssertEquals ("test#08", "Mack", Rows [2] [0]);                 
-                
-                       Rows = Child.Select ("age >= 20", "name asc");
-                       AssertEquals ("test#09", 3, Rows.Length);
-                       AssertEquals ("test#10", "Dick", Rows [0] [0]);
-                       AssertEquals ("test#11", "Mack", Rows [1] [0]);                 
-                       AssertEquals ("test#12", "Mick", Rows [2] [0]);                 
-
-                       Rows = Child.Select ("age >= 20", "name desc");
-                       AssertEquals ("test#09", 3, Rows.Length);
-                       AssertEquals ("test#10", "Mick", Rows [0] [0]);
-                       AssertEquals ("test#11", "Mack", Rows [1] [0]);                 
-                       AssertEquals ("test#12", "Dick", Rows [2] [0]);                 
-
-                }
+                       Assert.AreEqual (3, Rows.Length, "test#01");
+                       Assert.AreEqual ("Mack", Rows [0] [0], "test#02");
+                       Assert.AreEqual ("Mick", Rows [1] [0], "test#03");
+                       Assert.AreEqual ("Dick", Rows [2] [0], "test#04");
+
+                       Rows = Child.Select ("age >= 20", "age asc");
+                       Assert.AreEqual (3, Rows.Length, "test#05");
+                       Assert.AreEqual ("Dick", Rows [0] [0], "test#06");
+                       Assert.AreEqual ("Mick", Rows [1] [0], "test#07");
+                       Assert.AreEqual ("Mack", Rows [2] [0], "test#08");
+
+                       Rows = Child.Select ("age >= 20", "name asc");
+                       Assert.AreEqual (3, Rows.Length, "test#09");
+                       Assert.AreEqual ("Dick", Rows [0] [0], "test#10");
+                       Assert.AreEqual ("Mack", Rows [1] [0], "test#11");
+                       Assert.AreEqual ("Mick", Rows [2] [0], "test#12");
+
+                       Rows = Child.Select ("age >= 20", "name desc");
+                       Assert.AreEqual (3, Rows.Length, "test#09");
+                       Assert.AreEqual ("Mick", Rows [0] [0], "test#10");
+                       Assert.AreEqual ("Mack", Rows [1] [0], "test#11");
+                       Assert.AreEqual ("Dick", Rows [2] [0], "test#12");
+               }
 
                [Test]
                public void SelectParsing ()
@@ -303,46 +306,45 @@ namespace MonoTests.System.Data
                        Row [2] = 1;
                        T.Rows.Add (Row);
 
-                       AssertEquals ("test#01", 12, T.Select ("age<=10").Length);
+                       Assert.AreEqual (12, T.Select ("age<=10").Length, "test#01");
                        
-                       AssertEquals ("test#02", 12, T.Select ("age\n\t<\n\t=\t\n10").Length);
+                       Assert.AreEqual (12, T.Select ("age\n\t<\n\t=\t\n10").Length, "test#02");
 
                        try {
                                T.Select ("name = 1human ");
-                               Fail ("test#03");
-                       } catch (Exception e) {
-                               
+                               Assert.Fail ("test#03");
+                       } catch (SyntaxErrorException e) {
                                // missing operand after 'human' operand 
-                               AssertEquals ("test#04", typeof (SyntaxErrorException), e.GetType ());                          
+                               Assert.AreEqual (typeof (SyntaxErrorException), e.GetType (), "test#04");
                        }
                        
-                       try {                   
+                       try {
                                T.Select ("name = 1");
-                               Fail ("test#05");
-                       } catch (Exception e) {
-                               
+                               Assert.Fail ("test#05");
+                       } catch (EvaluateException e) {
                                // Cannot perform '=' operation between string and Int32
-                               AssertEquals ("test#06", typeof (EvaluateException), e.GetType ());
+                               Assert.AreEqual (typeof (EvaluateException), e.GetType (), "test#06");
                        }
                        
-                       AssertEquals ("test#07", 1, T.Select ("age = '13'").Length);
-
+                       Assert.AreEqual (1, T.Select ("age = '13'").Length, "test#07");
                }
-               
+
                [Test]
-               public void SelectEscaping () {
+               public void SelectEscaping ()
+               {
                        DataTable dt = new DataTable ();
                        dt.Columns.Add ("SomeCol");
                        dt.Rows.Add (new object [] {"\t"});
                        dt.Rows.Add (new object [] {"\\"});
                        
-                       AssertEquals ("test#01", 1, dt.Select (@"SomeCol='\t'").Length);
-                       AssertEquals ("test#02", 1, dt.Select (@"SomeCol='\\'").Length);
+                       Assert.AreEqual (1, dt.Select (@"SomeCol='\t'").Length, "test#01");
+                       Assert.AreEqual (1, dt.Select (@"SomeCol='\\'").Length, "test#02");
                        
                        try {
                                dt.Select (@"SomeCol='\x'");
-                               Fail("test#03");
-                       } catch (SyntaxErrorException) {}
+                               Assert.Fail ("test#03");
+                       } catch (SyntaxErrorException) {
+                       }
                }
 
                [Test]
@@ -375,18 +377,18 @@ namespace MonoTests.System.Data
                        Row [2] = 1;
                        T.Rows.Add (Row);
                        
-                       AssertEquals ("test#01", 11, T.Select ("age < 10").Length);
-                       AssertEquals ("test#02", 12, T.Select ("age <= 10").Length);                    
-                       AssertEquals ("test#03", 12, T.Select ("age< =10").Length);                     
-                       AssertEquals ("test#04", 89, T.Select ("age > 10").Length);
-                       AssertEquals ("test#05", 90, T.Select ("age >= 10").Length);                    
-                       AssertEquals ("test#06", 100, T.Select ("age <> 10").Length);
-                       AssertEquals ("test#07", 3, T.Select ("name < 'human10'").Length);
-                       AssertEquals ("test#08", 3, T.Select ("id < '10'").Length);
+                       Assert.AreEqual (11, T.Select ("age < 10").Length, "test#01");
+                       Assert.AreEqual (12, T.Select ("age <= 10").Length, "test#02");
+                       Assert.AreEqual (12, T.Select ("age< =10").Length, "test#03");
+                       Assert.AreEqual (89, T.Select ("age > 10").Length, "test#04");
+                       Assert.AreEqual (90, T.Select ("age >= 10").Length, "test#05");
+                       Assert.AreEqual (100, T.Select ("age <> 10").Length, "test#06");
+                       Assert.AreEqual (3, T.Select ("name < 'human10'").Length, "test#07");
+                       Assert.AreEqual (3, T.Select ("id < '10'").Length, "test#08");
                        // FIXME: Somebody explain how this can be possible.
                        // it seems that it is no matter between 10 - 30. The
                        // result is allways 25 :-P
-                       //AssertEquals ("test#09", 25, T.Select ("id < 10").Length);
+                       //Assert.AreEqual (25, T.Select ("id < 10").Length, "test#09");
                        
                }
 
@@ -412,24 +414,22 @@ namespace MonoTests.System.Data
                        
                        try {
                                T.Select ("name = human1");
-                               Fail ("test#01");
-                       } catch (Exception e) {
-                               
+                               Assert.Fail ("test#01");
+                       } catch (EvaluateException e) {
                                // column name human not found
-                               AssertEquals ("test#02", typeof (EvaluateException), e.GetType ());
+                               Assert.AreEqual (typeof (EvaluateException), e.GetType (), "test#02");
                        }
                        
-                       AssertEquals ("test#04", 1, T.Select ("id = '12'").Length);
-                       AssertEquals ("test#05", 1, T.Select ("id = 12").Length);
+                       Assert.AreEqual (1, T.Select ("id = '12'").Length, "test#04");
+                       Assert.AreEqual (1, T.Select ("id = 12").Length, "test#05");
                        
                        try {
                                T.Select ("id = 1k3");
-                               Fail ("test#06");
-                       } catch (Exception e) {
-                               
+                               Assert.Fail ("test#06");
+                       } catch (SyntaxErrorException e) {
                                // no operands after k3 operator
-                               AssertEquals ("test#07", typeof (SyntaxErrorException), e.GetType ());
-                       }                                               
+                               Assert.AreEqual (typeof (SyntaxErrorException), e.GetType (), "test#07");
+                       }
                }
                
                [Test]
@@ -460,57 +460,54 @@ namespace MonoTests.System.Data
                        Row [1] = 1;
                        Row [2] = 1;
                        T.Rows.Add (Row);
-                                       
-                       AssertEquals ("test#01", 1, T.Select ("name = 'human' + 1").Length);
+
+                       Assert.AreEqual (1, T.Select ("name = 'human' + 1").Length, "test#01");
                        
-                       AssertEquals ("test#02", "human1", T.Select ("name = 'human' + 1") [0] ["name"]);                       
-                       AssertEquals ("test#03", 1, T.Select ("name = 'human' + '1'").Length);
-                       AssertEquals ("test#04", "human1", T.Select ("name = 'human' + '1'") [0] ["name"]);                     
-                       AssertEquals ("test#05", 1, T.Select ("name = 'human' + 1 + 2").Length);
-                       AssertEquals ("test#06", "human12", T.Select ("name = 'human' + '1' + '2'") [0] ["name"]);
+                       Assert.AreEqual ("human1", T.Select ("name = 'human' + 1") [0] ["name"], "test#02");
+                       Assert.AreEqual (1, T.Select ("name = 'human' + '1'").Length, "test#03");
+                       Assert.AreEqual ("human1", T.Select ("name = 'human' + '1'") [0] ["name"], "test#04");
+                       Assert.AreEqual (1, T.Select ("name = 'human' + 1 + 2").Length, "test#05");
+                       Assert.AreEqual ("human12", T.Select ("name = 'human' + '1' + '2'") [0] ["name"], "test#06");
                        
-                       AssertEquals ("test#07", 1, T.Select ("name = 'huMAn' + 1").Length);
+                       Assert.AreEqual (1, T.Select ("name = 'huMAn' + 1").Length, "test#07");
                        
                        Set.CaseSensitive = true;
-                       AssertEquals ("test#08", 0, T.Select ("name = 'huMAn' + 1").Length);
+                       Assert.AreEqual (0, T.Select ("name = 'huMAn' + 1").Length, "test#08");
                        
                        T.CaseSensitive = false;
-                       AssertEquals ("test#09", 1, T.Select ("name = 'huMAn' + 1").Length);
+                       Assert.AreEqual (1, T.Select ("name = 'huMAn' + 1").Length, "test#09");
                        
                        T.CaseSensitive = true;
-                       AssertEquals ("test#10", 0, T.Select ("name = 'huMAn' + 1").Length);
+                       Assert.AreEqual (0, T.Select ("name = 'huMAn' + 1").Length, "test#10");
                        
                        Set.CaseSensitive = false;
-                       AssertEquals ("test#11", 0, T.Select ("name = 'huMAn' + 1").Length);
+                       Assert.AreEqual (0, T.Select ("name = 'huMAn' + 1").Length, "test#11");
                        
                        T.CaseSensitive = false;
-                       AssertEquals ("test#12", 1, T.Select ("name = 'huMAn' + 1").Length);
+                       Assert.AreEqual (1, T.Select ("name = 'huMAn' + 1").Length, "test#12");
                        
-                       AssertEquals ("test#13", 0, T.Select ("name = 'human1*'").Length);
-                       AssertEquals ("test#14", 11, T.Select ("name like 'human1*'").Length);
-                       AssertEquals ("test#15", 11, T.Select ("name like 'human1%'").Length);
+                       Assert.AreEqual (0, T.Select ("name = 'human1*'").Length, "test#13");
+                       Assert.AreEqual (11, T.Select ("name like 'human1*'").Length, "test#14");
+                       Assert.AreEqual (11, T.Select ("name like 'human1%'").Length, "test#15");
                        
                        try {
-                               AssertEquals ("test#16", 11, T.Select ("name like 'h*an1'").Length);
-                               Fail ("test#16");
-                       } catch (Exception e) {
-                               
+                               Assert.AreEqual (11, T.Select ("name like 'h*an1'").Length, "test#16");
+                               Assert.Fail ("test#16");
+                       } catch (EvaluateException e) {
                                // 'h*an1' is invalid
-                               AssertEquals ("test#17", typeof (EvaluateException), e.GetType ());
+                               Assert.AreEqual (typeof (EvaluateException), e.GetType (), "test#17");
                        }
                        
                        try {
-                               AssertEquals ("test#18", 11, T.Select ("name like 'h%an1'").Length);
-                               Fail ("test#19");
-                       } catch (Exception e) {
-                               
+                               Assert.AreEqual (11, T.Select ("name like 'h%an1'").Length, "test#18");
+                               Assert.Fail ("test#19");
+                       } catch (EvaluateException e) {
                                // 'h%an1' is invalid
-                               AssertEquals ("test#20", typeof (EvaluateException), e.GetType ());
+                               Assert.AreEqual (typeof (EvaluateException), e.GetType (), "test#20");
                        }
                        
-                       AssertEquals ("test#21", 0, T.Select ("name like 'h[%]an'").Length);
-                       AssertEquals ("test#22", 1, T.Select ("name like 'h[*]an'").Length);
-                       
+                       Assert.AreEqual (0, T.Select ("name like 'h[%]an'").Length, "test#21");
+                       Assert.AreEqual (1, T.Select ("name like 'h[*]an'").Length, "test#22");
                }
 
                [Test]
@@ -534,13 +531,13 @@ namespace MonoTests.System.Data
                                T.Rows.Add (Row);
                        }
                        
-                       AssertEquals ("test#01", 1000, T.Select ("Sum(age) > 10").Length);
-                       AssertEquals ("test#02", 1000, T.Select ("avg(age) = 499").Length);
-                       AssertEquals ("test#03", 1000, T.Select ("min(age) = 0").Length);
-                       AssertEquals ("test#04", 1000, T.Select ("max(age) = 999").Length);
-                       AssertEquals ("test#05", 1000, T.Select ("count(age) = 1000").Length);
-                       AssertEquals ("test#06", 1000, T.Select ("stdev(age) > 287 and stdev(age) < 289").Length);
-                       AssertEquals ("test#07", 1000, T.Select ("var(age) < 83417 and var(age) > 83416").Length);
+                       Assert.AreEqual (1000, T.Select ("Sum(age) > 10").Length, "test#01");
+                       Assert.AreEqual (1000, T.Select ("avg(age) = 499").Length, "test#02");
+                       Assert.AreEqual (1000, T.Select ("min(age) = 0").Length, "test#03");
+                       Assert.AreEqual (1000, T.Select ("max(age) = 999").Length, "test#04");
+                       Assert.AreEqual (1000, T.Select ("count(age) = 1000").Length, "test#05");
+                       Assert.AreEqual (1000, T.Select ("stdev(age) > 287 and stdev(age) < 289").Length, "test#06");
+                       Assert.AreEqual (1000, T.Select ("var(age) < 83417 and var(age) > 83416").Length, "test#07");
                }
                
                [Test]
@@ -571,174 +568,174 @@ namespace MonoTests.System.Data
                        T.Rows.Add (Row);
 
                        //TODO: How to test Convert-function
-                       AssertEquals ("test#01", 25, T.Select ("age = 5*5") [0]["age"]);                        
-                       AssertEquals ("test#02", 901, T.Select ("len(name) > 7").Length);
-                       AssertEquals ("test#03", 125, T.Select ("age = 5*5*5 AND len(name)>7") [0]["age"]);
-                       AssertEquals ("test#04", 1, T.Select ("isnull(id, 'test') = 'test'").Length);                   
-                       AssertEquals ("test#05", 1000, T.Select ("iif(id = '56', 'test', 'false') = 'false'").Length);                  
-                       AssertEquals ("test#06", 1, T.Select ("iif(id = '56', 'test', 'false') = 'test'").Length);
-                       AssertEquals ("test#07", 9, T.Select ("substring(id, 2, 3) = '23'").Length);
-                       AssertEquals ("test#08", "123", T.Select ("substring(id, 2, 3) = '23'") [0] ["id"]);
-                       AssertEquals ("test#09", "423", T.Select ("substring(id, 2, 3) = '23'") [3] ["id"]);
-                       AssertEquals ("test#10", "923", T.Select ("substring(id, 2, 3) = '23'") [8] ["id"]);
-                       
+                       Assert.AreEqual (25, T.Select ("age = 5*5") [0]["age"], "test#01");
+                       Assert.AreEqual (901, T.Select ("len(name) > 7").Length, "test#02");
+                       Assert.AreEqual (125, T.Select ("age = 5*5*5 AND len(name)>7") [0]["age"], "test#03");
+                       Assert.AreEqual (1, T.Select ("isnull(id, 'test') = 'test'").Length, "test#04");
+                       Assert.AreEqual (1000, T.Select ("iif(id = '56', 'test', 'false') = 'false'").Length, "test#05");
+                       Assert.AreEqual (1, T.Select ("iif(id = '56', 'test', 'false') = 'test'").Length, "test#06");
+                       Assert.AreEqual (9, T.Select ("substring(id, 2, 3) = '23'").Length, "test#07");
+                       Assert.AreEqual ("123", T.Select ("substring(id, 2, 3) = '23'") [0] ["id"], "test#08");
+                       Assert.AreEqual ("423", T.Select ("substring(id, 2, 3) = '23'") [3] ["id"], "test#09");
+                       Assert.AreEqual ("923", T.Select ("substring(id, 2, 3) = '23'") [8] ["id"], "test#10");
                }
 
                [Test]
                public void SelectRelations ()
                {
-                        DataSet Set = new DataSet ();
-                        DataTable Mom = new DataTable ("Mom");
-                        DataTable Child = new DataTable ("Child");
-
-                        Set.Tables.Add (Mom);
-                        Set.Tables.Add (Child);
-                        
-                        DataColumn Col = new DataColumn ("Name");
-                        DataColumn Col2 = new DataColumn ("ChildName");
-                        Mom.Columns.Add (Col);
-                        Mom.Columns.Add (Col2);
-                        
-                        DataColumn Col3 = new DataColumn ("Name");
-                        DataColumn Col4 = new DataColumn ("Age");
-                        Col4.DataType = Type.GetType ("System.Int16");
-                        Child.Columns.Add (Col3);
-                        Child.Columns.Add (Col4);
-                        
-                        DataRelation Relation = new DataRelation ("Rel", Mom.Columns [1], Child.Columns [0]);
-                        Set.Relations.Add (Relation);
-
-                        DataRow Row = Mom.NewRow ();
-                        Row [0] = "Laura";
-                        Row [1] = "Nick";
-                        Mom.Rows.Add (Row);
-                        
-                        Row = Mom.NewRow ();
-                        Row [0] = "Laura";
-                        Row [1] = "Dick";
-                        Mom.Rows.Add (Row);
-                        
-                        Row = Mom.NewRow ();
-                        Row [0] = "Laura";
-                        Row [1] = "Mick";
-                        Mom.Rows.Add (Row);
-
-                        Row = Mom.NewRow ();
-                        Row [0] = "Teresa";
-                        Row [1] = "Jack";
-                        Mom.Rows.Add (Row);
-                        
-                        Row = Mom.NewRow ();
-                        Row [0] = "Teresa";
-                        Row [1] = "Mack";
-                        Mom.Rows.Add (Row);
-                        
-                        Row = Child.NewRow ();
-                        Row [0] = "Nick";
-                        Row [1] = 15;
-                        Child.Rows.Add (Row);
-                        
-                        Row = Child.NewRow ();
-                        Row [0] = "Dick";
-                        Row [1] = 25;
-                        Child.Rows.Add (Row);
-                        
-                        Row = Child.NewRow ();
-                        Row [0] = "Mick";
-                        Row [1] = 35;
-                        Child.Rows.Add (Row);
-                        
-                        Row = Child.NewRow ();
-                        Row [0] = "Jack";
-                        Row [1] = 10;
-                        Child.Rows.Add (Row);
-                        
-                        Row = Child.NewRow ();
-                        Row [0] = "Mack";
-                        Row [1] = 19;
-                        Child.Rows.Add (Row);
-                
-                        Row = Child.NewRow ();
-                        Row [0] = "Mack";
-                        Row [1] = 99;
-                        Child.Rows.Add (Row);
+                       DataSet Set = new DataSet ();
+                       DataTable Mom = new DataTable ("Mom");
+                       DataTable Child = new DataTable ("Child");
+
+                       Set.Tables.Add (Mom);
+                       Set.Tables.Add (Child);
+
+                       DataColumn Col = new DataColumn ("Name");
+                       DataColumn Col2 = new DataColumn ("ChildName");
+                       Mom.Columns.Add (Col);
+                       Mom.Columns.Add (Col2);
+
+                       DataColumn Col3 = new DataColumn ("Name");
+                       DataColumn Col4 = new DataColumn ("Age");
+                       Col4.DataType = typeof (short);
+                       Child.Columns.Add (Col3);
+                       Child.Columns.Add (Col4);
+
+                       DataRelation Relation = new DataRelation ("Rel", Mom.Columns [1], Child.Columns [0]);
+                       Set.Relations.Add (Relation);
+
+                       DataRow Row = Mom.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Nick";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Dick";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Mick";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Teresa";
+                       Row [1] = "Jack";
+                       Mom.Rows.Add (Row);
+
+                       Row = Mom.NewRow ();
+                       Row [0] = "Teresa";
+                       Row [1] = "Mack";
+                       Mom.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Nick";
+                       Row [1] = 15;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Dick";
+                       Row [1] = 25;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mick";
+                       Row [1] = 35;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Jack";
+                       Row [1] = 10;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mack";
+                       Row [1] = 19;
+                       Child.Rows.Add (Row);
+
+                       Row = Child.NewRow ();
+                       Row [0] = "Mack";
+                       Row [1] = 99;
+                       Child.Rows.Add (Row);
                        
                        DataRow [] Rows = Child.Select ("name = Parent.Childname");
-                       AssertEquals ("test#01", 6, Rows.Length);
+                       Assert.AreEqual (6, Rows.Length, "test#01");
                        Rows = Child.Select ("Parent.childname = 'Jack'");
-                       AssertEquals ("test#02", 1, Rows.Length);
+                       Assert.AreEqual (1, Rows.Length, "test#02");
                        
                        /*
                        try {
                                // FIXME: LAMESPEC: Why the exception is thrown why... why... 
                                Mom.Select ("Child.Name = 'Jack'");
-                               Fail ("test#03");
+                               Assert.Fail ("test#03");
                        } catch (Exception e) {
-                               AssertEquals ("test#04", typeof (SyntaxErrorException), e.GetType ());
-                               AssertEquals ("test#05", "Cannot interpret token 'Child' at position 1.", e.Message);
+                               Assert.AreEqual (typeof (SyntaxErrorException), e.GetType (), "test#04");
+                               Assert.AreEqual ("Cannot interpret token 'Child' at position 1.", e.Message, "test#05");
                        }
                        */
                        
                        Rows = Child.Select ("Parent.name = 'Laura'");
-                       AssertEquals ("test#06", 3, Rows.Length);
+                       Assert.AreEqual (3, Rows.Length, "test#06");
                        
                        DataTable Parent2 = new DataTable ("Parent2");
-                        Col = new DataColumn ("Name");
-                        Col2 = new DataColumn ("ChildName");
-
-                        Parent2.Columns.Add (Col);
-                        Parent2.Columns.Add (Col2);
-                        Set.Tables.Add (Parent2);
-                        
-                        Row = Parent2.NewRow ();
-                        Row [0] = "Laura";
-                        Row [1] = "Nick";
-                        Parent2.Rows.Add (Row);
-                        
-                        Row = Parent2.NewRow ();
-                        Row [0] = "Laura";
-                        Row [1] = "Dick";
-                        Parent2.Rows.Add (Row);
-                        
-                        Row = Parent2.NewRow ();
-                        Row [0] = "Laura";
-                        Row [1] = "Mick";
-                        Parent2.Rows.Add (Row);
-
-                        Row = Parent2.NewRow ();
-                        Row [0] = "Teresa";
-                        Row [1] = "Jack";
-                        Parent2.Rows.Add (Row);
-                        
-                        Row = Parent2.NewRow ();
-                        Row [0] = "Teresa";
-                        Row [1] = "Mack";
-                        Parent2.Rows.Add (Row);
-
-                        Relation = new DataRelation ("Rel2", Parent2.Columns [1], Child.Columns [0]);
-                        Set.Relations.Add (Relation);
-                       
+                       Col = new DataColumn ("Name");
+                       Col2 = new DataColumn ("ChildName");
+
+                       Parent2.Columns.Add (Col);
+                       Parent2.Columns.Add (Col2);
+                       Set.Tables.Add (Parent2);
+
+                       Row = Parent2.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Nick";
+                       Parent2.Rows.Add (Row);
+
+                       Row = Parent2.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Dick";
+                       Parent2.Rows.Add (Row);
+
+                       Row = Parent2.NewRow ();
+                       Row [0] = "Laura";
+                       Row [1] = "Mick";
+                       Parent2.Rows.Add (Row);
+
+                       Row = Parent2.NewRow ();
+                       Row [0] = "Teresa";
+                       Row [1] = "Jack";
+                       Parent2.Rows.Add (Row);
+
+                       Row = Parent2.NewRow ();
+                       Row [0] = "Teresa";
+                       Row [1] = "Mack";
+                       Parent2.Rows.Add (Row);
+
+                       Relation = new DataRelation ("Rel2", Parent2.Columns [1], Child.Columns [0]);
+                       Set.Relations.Add (Relation);
+
                        try {
                                Rows = Child.Select ("Parent.ChildName = 'Jack'");
-                               Fail ("test#07");
-                       } catch (Exception e) {
-                               AssertEquals ("test#08", typeof (EvaluateException), e.GetType ());
-                               //AssertEquals ("test#09", "The table [Child] involved in more than one relation. You must explicitly mention a relation name in the expression 'parent.[ChildName]'.", e.Message);
+                               Assert.Fail ("test#07");
+                       } catch (EvaluateException e) {
+                               Assert.AreEqual (typeof (EvaluateException), e.GetType (), "test#08");
+                               // Do not compare exception messages!
+                               //Assert.AreEqual ("The table [Child] involved in more than one relation. You must explicitly mention a relation name in the expression 'parent.[ChildName]'.", e.Message, "test#09");
                        }
                        
                        Rows = Child.Select ("Parent(rel).ChildName = 'Jack'");
-                       AssertEquals ("test#10", 1, Rows.Length);
+                       Assert.AreEqual (1, Rows.Length, "test#10");
 
                        Rows = Child.Select ("Parent(Rel2).ChildName = 'Jack'");
-                       AssertEquals ("test#10", 1, Rows.Length);
+                       Assert.AreEqual (1, Rows.Length, "test#10");
                        
                        try {
-                               Mom.Select ("Parent.name  = 'John'");
-                       } catch (Exception e) {
-                               AssertEquals ("test#11", typeof (IndexOutOfRangeException), e.GetType ());
-                               AssertEquals ("test#12", "Cannot find relation 0.", e.Message);
+                               Mom.Select ("Parent.name  = 'John'");
+                       } catch (IndexOutOfRangeException e) {
+                               Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType (), "test#11");
+                               // Do not compare exception messages!
+                               //Assert.AreEqual ("Cannot find relation 0.", e.Message, "test#12");
                        }
-                       
                }
 
                [Test]
@@ -747,25 +744,24 @@ namespace MonoTests.System.Data
                        DataTable d = new DataTable();
                        d.Columns.Add (new DataColumn ("aaa"));
                        DataRow [] rows = d.Select (null, null, DataViewRowState.Deleted);
-                       AssertEquals(0, rows.Length);
+                       Assert.AreEqual (0, rows.Length);
                        d.Rows.Add (new object [] {"bbb"});
                        d.Rows.Add (new object [] {"bbb"});
                        rows = d.Select (null, null, DataViewRowState.Deleted);
-                       AssertEquals(0, rows.Length);
+                       Assert.AreEqual (0, rows.Length);
                }
 
                [Test]
                public void ToStringTest()
                {
                        DataTable dt = new DataTable();
-                       dt.Columns.Add("Col1",typeof(int));
-                       
+                       dt.Columns.Add("Col1", typeof(int));
+
                        dt.TableName = "Mytable";
                        dt.DisplayExpression = "Col1";
-                       
-                       
+
                        string cmpr = dt.TableName + " + " + dt.DisplayExpression;
-                       AssertEquals(cmpr,dt.ToString());
+                       Assert.AreEqual (cmpr, dt.ToString());
                }
 
                [Test]
@@ -779,47 +775,47 @@ namespace MonoTests.System.Data
                        dt.Columns.Add ();
                        dt.Columns.Add ();
                        dt.Columns.Add ();
-                       
-                       AssertEquals ("test#01", 0, dt.PrimaryKey.Length);
-                       
+
+                       Assert.AreEqual (0, dt.PrimaryKey.Length, "test#01");
+
                        dt.PrimaryKey = new DataColumn [] {dt.Columns [0]};
-                       AssertEquals ("test#02", 1, dt.PrimaryKey.Length);
-                       AssertEquals ("test#03", "Column1", dt.PrimaryKey [0].ColumnName);
-                       
+                       Assert.AreEqual (1, dt.PrimaryKey.Length, "test#02");
+                       Assert.AreEqual ("Column1", dt.PrimaryKey [0].ColumnName, "test#03");
+
                        dt.PrimaryKey = null;
-                       AssertEquals ("test#04", 0, dt.PrimaryKey.Length);
-                       
+                       Assert.AreEqual (0, dt.PrimaryKey.Length, "test#04");
+
                        Col = new DataColumn ("failed");
-                       
+
                        try {
                                dt.PrimaryKey = new DataColumn [] {Col};
-                               Fail ("test#05");                                       
-                       } catch (Exception e) {
-                               AssertEquals ("test#06", typeof (ArgumentException), e.GetType ());
-                               AssertEquals ("test#07", "Column must belong to a table.", e.Message);
+                               Assert.Fail ("test#05");
+                       } catch (ArgumentException e) {
+                               Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#06");
+                               // Never expect English message
+                               // Assert.AreEqual ("Column must belong to a table.", e.Message, "test#07");
                        }
-                       
+
                        DataTable dt2 = new DataTable ();
                        dt2.Columns.Add ();
-                       
+
                        try {
                                dt.PrimaryKey = new DataColumn [] {dt2.Columns [0]};
-                               Fail ("test#08");
-                       } catch (Exception e) {
-                               AssertEquals ("test#09", typeof (ArgumentException), e.GetType ());
-                               AssertEquals ("test#10", "PrimaryKey columns do not belong to this table.", e.Message);
+                               Assert.Fail ("test#08");
+                       } catch (ArgumentException e) {
+                               Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#09");
+                               // Never expect English message
+                               // Assert.AreEqual ("PrimaryKey columns do not belong to this table.", e.Message, "test#10");
                        }
-                       
-                       
-                       AssertEquals ("test#11", 0, dt.Constraints.Count);
-                       
+
+                       Assert.AreEqual (0, dt.Constraints.Count, "test#11");
+
                        dt.PrimaryKey = new DataColumn [] {dt.Columns [0], dt.Columns [1]};
-                       AssertEquals ("test#12", 2, dt.PrimaryKey.Length);
-                       AssertEquals ("test#13", 1, dt.Constraints.Count);
-                       AssertEquals ("test#14", true, dt.Constraints [0] is UniqueConstraint);
-                       AssertEquals ("test#15", "Column1", dt.PrimaryKey [0].ColumnName);
-                       AssertEquals ("test#16", "Column2", dt.PrimaryKey [1].ColumnName);
-                       
+                       Assert.AreEqual (2, dt.PrimaryKey.Length, "test#12");
+                       Assert.AreEqual (1, dt.Constraints.Count, "test#13");
+                       Assert.IsTrue (dt.Constraints [0] is UniqueConstraint, "test#14");
+                       Assert.AreEqual ("Column1", dt.PrimaryKey [0].ColumnName, "test#15");
+                       Assert.AreEqual ("Column2", dt.PrimaryKey [1].ColumnName, "test#16");
                }
                
                [Test]
@@ -833,24 +829,24 @@ namespace MonoTests.System.Data
 
                        DataColumn col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table.Columns.Add (col);
                        UniqueConstraint uc = new UniqueConstraint ("UK1", table.Columns[0] );
                        table.Constraints.Add (uc);
                        table.CaseSensitive = false;
-                                                                                                                           
+
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
+                       col.DataType = typeof (string);
                        table.Columns.Add (col);
-                       
+
                        col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table1.Columns.Add (col);
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
+                       col.DataType = typeof (string);
                        table1.Columns.Add (col);
 
                        DataRelation dr = new DataRelation ("DR", table.Columns[0], table1.Columns[0]);
@@ -859,36 +855,22 @@ namespace MonoTests.System.Data
                        try {
                                table.CaseSensitive = true;
                                table1.CaseSensitive = true;
-                               Fail ("#A01");
-                       }
-                       catch (Exception e) {
-                               if (e.GetType () != typeof (AssertionException))
-                                       AssertEquals ("#A02", "Cannot change CaseSensitive or Locale property. This change would lead to at least one DataRelation or Constraint to have different Locale or CaseSensitive settings between its related tables.",e.Message);
-                               else
-                                       Console.WriteLine (e);
+                               Assert.Fail ("#A01");
+                       } catch (ArgumentException) {
                        }
+
                        try {
                                CultureInfo cultureInfo = new CultureInfo ("en-gb");
                                table.Locale = cultureInfo;
                                table1.Locale = cultureInfo;
-                               Fail ("#A03");
-                       }
-                       catch (Exception e) {
-                                if (e.GetType () != typeof (AssertionException))
-                                       AssertEquals ("#A04", "Cannot change CaseSensitive or Locale property. This change would lead to at least one DataRelation or Constraint to have different Locale or CaseSensitive settings between its related tables.",e.Message);
-                               else
-                                       Console.WriteLine (e);
+                               Assert.Fail ("#A03");
+                       } catch (ArgumentException) {
                        }
+
                        try {
                                table.Prefix = "Prefix#1";
-                               Fail ("#A05");
-                       }
-                       catch (Exception e){
-                               if (e.GetType () != typeof (AssertionException))
-                                       AssertEquals ("#A06", "Prefix 'Prefix#1' is not valid, because it contains special characters.",e.Message);
-                               else
-                                       Console.WriteLine (e);
-
+                               Assert.Fail ("#A05");
+                       } catch (DataException) {
                        }
                }
 
@@ -899,12 +881,12 @@ namespace MonoTests.System.Data
 
                        DataColumn col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table.Columns.Add (col);
-                                                                                                                             
+
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
+                       col.DataType = typeof (string);
                        table.Columns.Add (col);
                        
                        DataRow row = table.NewRow ();
@@ -913,10 +895,10 @@ namespace MonoTests.System.Data
                        row.RowError = "Error#1";
                        table.Rows.Add (row);
 
-                       AssertEquals ("#A01", 1, table.GetErrors ().Length);
-                       AssertEquals ("#A02", "Error#1", (table.GetErrors ())[0].RowError);
+                       Assert.AreEqual (1, table.GetErrors ().Length, "#A01");
+                       Assert.AreEqual ("Error#1", (table.GetErrors ())[0].RowError, "#A02");
                }
-#if NET_2_0
+
                [Test]
                public void NewRowAddedTest ()
                {
@@ -924,24 +906,24 @@ namespace MonoTests.System.Data
 
                        DataColumn col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table.Columns.Add (col);
-                                                                                                                             
+
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
+                       col.DataType = typeof (string);
                        table.Columns.Add (col);
                        
-                        _tableNewRowAddedEventFired = false;
-                        table.TableNewRow += new DataTableNewRowEventHandler (OnTableNewRowAdded);
+                       _tableNewRowAddedEventFired = false;
+                       table.TableNewRow += new DataTableNewRowEventHandler (OnTableNewRowAdded);
                        DataRow row = table.NewRow ();
                        row ["Id"] = 147;
                        row ["name"] = "Abc";
                        table.Rows.Add (row);
 
-                       AssertEquals ("#NewRowAdded Event #01", true, _tableNewRowAddedEventFired);
+                       Assert.IsTrue (_tableNewRowAddedEventFired, "#NewRowAdded Event #01");
                }
-#endif
+
                [Test]
                public void CloneCopyTest ()
                {
@@ -949,9 +931,9 @@ namespace MonoTests.System.Data
                        table.TableName = "Table#1";
                        DataTable table1 = new DataTable ();
                        table1.TableName = "Table#2";
-                
+
                        table.AcceptChanges ();
-                       
+
                        DataSet set = new DataSet ("Data Set#1");
                        set.DataSetName = "Dataset#1";
                        set.Tables.Add (table);
@@ -959,37 +941,37 @@ namespace MonoTests.System.Data
 
                        DataColumn col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table.Columns.Add (col);
                        UniqueConstraint uc = new UniqueConstraint ("UK1", table.Columns[0] );
                        table.Constraints.Add (uc);
-                
+
                        col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table1.Columns.Add (col);
-                                                                                                                             
+
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
+                       col.DataType = typeof (string);
                        table.Columns.Add (col);
                        
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
-                       table1.Columns.Add (col);
+                       col.DataType = typeof (string);
+                       table1.Columns.Add (col);
                        DataRow row = table.NewRow ();
                        row ["Id"] = 147;
                        row ["name"] = "Abc";
                        row.RowError = "Error#1";
                        table.Rows.Add (row);
-                                                                                                                             
+
                        row = table.NewRow ();
                        row ["Id"] = 47;
                        row ["name"] = "Efg";
                        table.Rows.Add (row);
                        table.AcceptChanges ();
-                                                                                                                             
+
                        table.CaseSensitive = true;
                        table1.CaseSensitive = true;
                        table.MinimumCapacity = 100;
@@ -999,11 +981,6 @@ namespace MonoTests.System.Data
                        DataColumn[] colArray = {table.Columns[0]};
                        table.PrimaryKey = colArray;
                        table.ExtendedProperties.Add ("TimeStamp", DateTime.Now);
-#if NET_1_1 // This prevents further tests after .NET 1.1.
-#else
-                       CultureInfo cultureInfo = new CultureInfo ("en-gb");
-                       table.Locale = cultureInfo;
-#endif
 
                        row = table1.NewRow ();
                        row ["Name"] = "Abc";
@@ -1014,51 +991,80 @@ namespace MonoTests.System.Data
                        row ["Id"] = 47;
                        row ["Name"] = "Efg";
                        table1.Rows.Add (row);
-                
+
                        DataRelation dr = new DataRelation ("DR", table.Columns[0], table1.Columns[0]);
                        set.Relations.Add (dr);
 
                        //Testing properties of clone
                        DataTable cloneTable = table.Clone ();
-                       AssertEquals ("#A01",true ,cloneTable.CaseSensitive);
-                       AssertEquals ("#A02", 0 , cloneTable.ChildRelations.Count);
-                       AssertEquals ("#A03", 0 , cloneTable.ParentRelations.Count);
-                       AssertEquals ("#A04", 2,  cloneTable.Columns.Count);
-                       AssertEquals ("#A05", 1, cloneTable.Constraints.Count);
-                       AssertEquals ("#A06", "Id / Name + (Id * Id)", cloneTable.DisplayExpression);
-                       AssertEquals ("#A07", 1 ,cloneTable.ExtendedProperties.Count);
-                       AssertEquals ("#A08", false ,cloneTable.HasErrors);
-#if NET_1_1
-#else
-                       AssertEquals ("#A09", 2057, cloneTable.Locale.LCID);
-#endif
-                       AssertEquals ("#A10", 100, cloneTable.MinimumCapacity);
-                       AssertEquals ("#A11","Namespace#1", cloneTable.Namespace);
-                       AssertEquals ("#A12", "PrefixNo:1",cloneTable.Prefix);
-                       AssertEquals ("#A13", "Id",  cloneTable.PrimaryKey[0].ColumnName);
-                       AssertEquals ("#A14",0 , cloneTable.Rows.Count );
-                       AssertEquals ("#A15", "Table#1", cloneTable.TableName);
+                       Assert.IsTrue (cloneTable.CaseSensitive, "#A01");
+                       Assert.AreEqual (0 , cloneTable.ChildRelations.Count, "#A02");
+                       Assert.AreEqual (0 , cloneTable.ParentRelations.Count, "#A03");
+                       Assert.AreEqual (2,  cloneTable.Columns.Count, "#A04");
+                       Assert.AreEqual (1, cloneTable.Constraints.Count, "#A05");
+                       Assert.AreEqual ("Id / Name + (Id * Id)", cloneTable.DisplayExpression, "#A06");
+                       Assert.AreEqual (1, cloneTable.ExtendedProperties.Count, "#A07");
+                       Assert.IsFalse (cloneTable.HasErrors, "#A08");
+                       Assert.AreEqual (100, cloneTable.MinimumCapacity, "#A10");
+                       Assert.AreEqual ("Namespace#1", cloneTable.Namespace, "#A11");
+                       Assert.AreEqual ("PrefixNo:1", cloneTable.Prefix, "#A12");
+                       Assert.AreEqual ("Id",  cloneTable.PrimaryKey[0].ColumnName, "#A13");
+                       Assert.AreEqual (0, cloneTable.Rows.Count , "#A14");
+                       Assert.AreEqual ("Table#1", cloneTable.TableName, "#A15");
 
                        //Testing properties of copy
                        DataTable copyTable = table.Copy ();
-                       AssertEquals ("#A16",true ,copyTable.CaseSensitive);
-                       AssertEquals ("#A17", 0 , copyTable.ChildRelations.Count);
-                       AssertEquals ("#A18", 0 , copyTable.ParentRelations.Count);
-                       AssertEquals ("#A19", 2,  copyTable.Columns.Count);
-                       AssertEquals ("#A20", 1, copyTable.Constraints.Count);
-                       AssertEquals ("#A21", "Id / Name + (Id * Id)", copyTable.DisplayExpression);
-                       AssertEquals ("#A22", 1 ,copyTable.ExtendedProperties.Count);
-                       AssertEquals ("#A23", true ,copyTable.HasErrors);
-#if NET_1_1
-#else
-                       AssertEquals ("#A24", 2057, copyTable.Locale.LCID);
-#endif
-                       AssertEquals ("#A25", 100, copyTable.MinimumCapacity);
-                       AssertEquals ("#A26","Namespace#1", copyTable.Namespace);
-                       AssertEquals ("#A27", "PrefixNo:1",copyTable.Prefix);
-                       AssertEquals ("#A28", "Id",  copyTable.PrimaryKey[0].ColumnName);
-                       AssertEquals ("#A29", 2 , copyTable.Rows.Count );
-                       AssertEquals ("#A30", "Table#1", copyTable.TableName);
+                       Assert.IsTrue (copyTable.CaseSensitive, "#A16");
+                       Assert.AreEqual (0 , copyTable.ChildRelations.Count, "#A17");
+                       Assert.AreEqual (0 , copyTable.ParentRelations.Count, "#A18");
+                       Assert.AreEqual (2,  copyTable.Columns.Count, "#A19");
+                       Assert.AreEqual (1, copyTable.Constraints.Count, "#A20");
+                       Assert.AreEqual ("Id / Name + (Id * Id)", copyTable.DisplayExpression, "#A21");
+                       Assert.AreEqual (1, copyTable.ExtendedProperties.Count, "#A22");
+                       Assert.IsTrue (copyTable.HasErrors, "#A23");
+                       Assert.AreEqual (100, copyTable.MinimumCapacity, "#A25");
+                       Assert.AreEqual ("Namespace#1", copyTable.Namespace, "#A26");
+                       Assert.AreEqual ("PrefixNo:1", copyTable.Prefix, "#A27");
+                       Assert.AreEqual ("Id",  copyTable.PrimaryKey[0].ColumnName, "#A28");
+                       Assert.AreEqual (2, copyTable.Rows.Count, "#A29");
+                       Assert.AreEqual ("Table#1", copyTable.TableName, "#A30");
+               }
+
+               [Test]
+               public void CloneExtendedProperties ()
+               {
+                       // bug 668
+                       DataTable t1 = new DataTable ("t1");
+                       DataColumn c1 = t1.Columns.Add ("c1");
+                       c1.ExtendedProperties.Add ("Company", "Xamarin");
+                       
+                       DataTable t2 = t1.Clone ();
+                       Assert.AreEqual ("Xamarin", t1.Columns["c1"].ExtendedProperties["Company"], "CEP1");
+                       Assert.AreEqual ("Xamarin", t2.Columns["c1"].ExtendedProperties["Company"], "CEP2");
+               }
+       
+               [Test]
+               [ExpectedException (typeof (EvaluateException))]
+               public void CloneExtendedProperties1 ()
+               {
+                       // Xamarin bug 666
+                       DataTable table1 = new DataTable("Table1") ;
+
+                       DataColumn c1 = table1.Columns.Add("c1", typeof(string), "'hello ' + c2") ; /* Should cause an exception */
+               }
+
+               [Test]
+               public void CloneExtendedProperties2 ()
+               {
+                       // Xamarin bug 666
+                       DataTable table1 = new  DataTable("Table1") ;
+
+                       DataColumn c1 = table1.Columns.Add("c1") ;
+                       DataColumn c2 = table1.Columns.Add("c2") ;
+
+                       c1.Expression = "'hello ' + c2";
+
+                       DataTable t2 = table1.Clone(); // this should not cause an exception
                }
 
                [Test]
@@ -1067,35 +1073,35 @@ namespace MonoTests.System.Data
                        DataTable table = new DataTable ();
                        DataColumn col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        col.DefaultValue = 47;
                        table.Columns.Add (col);
                        UniqueConstraint uc = new UniqueConstraint ("UK1", table.Columns[0] );
                        table.Constraints.Add (uc);
-                
+
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
+                       col.DataType = typeof (string);
                        col.DefaultValue = "Hello";
                        table.Columns.Add (col);
-                
+
                        table.BeginLoadData();
                        object[] row = {147, "Abc"};
                        DataRow newRow = table.LoadDataRow (row, true);
-                
+
                        object[] row1 = {147, "Efg"};
                        DataRow newRow1 = table.LoadDataRow (row1, true);
-                                                                                                                             
+
                        object[] row2 = {143, "Hij"};
                        DataRow newRow2 = table.LoadDataRow (row2, true);
-                                                                                                                             
+
                        try {
                                table.EndLoadData ();
-                               Fail ("#A01");
-                       }
-                       catch (ConstraintException) {
+                               Assert.Fail ("#A01");
+                       } catch (ConstraintException) {
                        }
                }
+
                [Test]
                public void Changes () //To test GetChanges and RejectChanges
                {
@@ -1103,22 +1109,22 @@ namespace MonoTests.System.Data
 
                        DataColumn col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table.Columns.Add (col);
                        UniqueConstraint uc = new UniqueConstraint ("UK1", table.Columns[0] );
                        table.Constraints.Add (uc);
-                                                                                                                             
+
                        col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
-                       table.Columns.Add (col);                        
+                       col.DataType = typeof (string);
+                       table.Columns.Add (col);
 
                        DataRow row = table.NewRow ();
                        row ["Id"] = 147;
                        row ["name"] = "Abc";
                        table.Rows.Add (row);
                        table.AcceptChanges ();
-                        
+
                        row = table.NewRow ();
                        row ["Id"] = 47;
                        row ["name"] = "Efg";
@@ -1126,123 +1132,128 @@ namespace MonoTests.System.Data
 
                        //Testing GetChanges
                        DataTable changesTable = table.GetChanges ();
-                       AssertEquals ("#A01", 1 ,changesTable.Rows.Count);
-                       AssertEquals ("#A02","Efg" ,changesTable.Rows[0]["Name"]);                      
+                       Assert.AreEqual (1, changesTable.Rows.Count, "#A01");
+                       Assert.AreEqual ("Efg", changesTable.Rows[0]["Name"], "#A02");
                        table.AcceptChanges ();
                        changesTable = table.GetChanges ();
+
                        try {
                                int cnt = changesTable.Rows.Count;
-                       }
-                       catch(Exception e) {
-                               if (e.GetType () != typeof (AssertionException))
-                                       AssertEquals ("#A03",typeof(NullReferenceException) ,e.GetType ());
-                               else
-                                       Console.WriteLine (e);
+                               Assert.Fail ();
+                       } catch (NullReferenceException) {
                        }
                        
                        //Testing RejectChanges
                        row = table.NewRow ();
-                        row ["Id"] = 247;
-                        row ["name"] = "Hij";
-                        table.Rows.Add (row);
+                       row ["Id"] = 247;
+                       row ["name"] = "Hij";
+                       table.Rows.Add (row);
 
                        (table.Rows [0])["Name"] = "AaBbCc";
                        table.RejectChanges ();
-                       AssertEquals ("#A03", "Abc" , (table.Rows [0]) ["Name"]);
-                       AssertEquals ("#A04", 2, table.Rows.Count);
+                       Assert.AreEqual ("Abc" , (table.Rows [0]) ["Name"], "#A03");
+                       Assert.AreEqual (2, table.Rows.Count, "#A04");
                }
-               
-                [Test]
-                public void ImportRowTest ()
-                {
-                        // build source table
-                        DataTable src = new DataTable ();
-                        src.Columns.Add ("id", typeof (int));
-                        src.Columns.Add ("name", typeof (string));
-
-                        src.PrimaryKey = new DataColumn [] {src.Columns [0]} ;
-
-                        src.Rows.Add (new object [] { 1, "mono 1" });
-                        src.Rows.Add (new object [] { 2, "mono 2" });
-                        src.Rows.Add (new object [] { 3, "mono 3" });
-                        src.AcceptChanges ();
-
-                        src.Rows [0] [1] = "mono changed 1";  // modify 1st row
-                        src.Rows [1].Delete ();              // delete 2nd row
-                        // 3rd row is unchanged
-                        src.Rows.Add (new object [] { 4, "mono 4" }); // add 4th row
-
-                        // build target table
-                        DataTable target = new DataTable ();
-                        target.Columns.Add ("id", typeof (int));
-                        target.Columns.Add ("name", typeof (string));
-
-                        target.PrimaryKey = new DataColumn [] {target.Columns [0]} ;
-
-                        // import all rows
-                        target.ImportRow (src.Rows [0]);     // import 1st row
-                        target.ImportRow (src.Rows [1]);     // import 2nd row
-                        target.ImportRow (src.Rows [2]);     // import 3rd row
-                        target.ImportRow (src.Rows [3]);     // import 4th row
-
-                        try {
-                                target.ImportRow (src.Rows [2]); // import 3rd row again
-                                Fail ("#AA1 Should have thrown exception violativ PK");
-                        } catch (ConstraintException e) {}
-
-                        // check row states
-                        AssertEquals ("#A1", src.Rows [0].RowState, target.Rows [0].RowState);
-                        AssertEquals ("#A2", src.Rows [1].RowState, target.Rows [1].RowState);
-                        AssertEquals ("#A3", src.Rows [2].RowState, target.Rows [2].RowState);
-                        AssertEquals ("#A4", src.Rows [3].RowState, target.Rows [3].RowState);
-
-                        // check for modified row (1st row)
-                        AssertEquals ("#B1", (string) src.Rows [0] [1], (string) target.Rows [0] [1]);
-                        AssertEquals ("#B2", (string) src.Rows [0] [1, DataRowVersion.Default], (string) target.Rows [0] [1, DataRowVersion.Default]);
-                        AssertEquals ("#B3", (string) src.Rows [0] [1, DataRowVersion.Original], (string) target.Rows [0] [1, DataRowVersion.Original]);
-                        AssertEquals ("#B4", (string) src.Rows [0] [1, DataRowVersion.Current], (string) target.Rows [0] [1, DataRowVersion.Current]);
-                        AssertEquals ("#B5", false, target.Rows [0].HasVersion(DataRowVersion.Proposed));
-
-                        // check for deleted row (2nd row)
-                        AssertEquals ("#C1", (string) src.Rows [1] [1, DataRowVersion.Original], (string) target.Rows [1] [1, DataRowVersion.Original]);
-
-                        // check for unchanged row (3rd row)
-                        AssertEquals ("#D1", (string) src.Rows [2] [1], (string) target.Rows [2] [1]);
-                        AssertEquals ("#D2", (string) src.Rows [2] [1, DataRowVersion.Default], (string) target.Rows [2] [1, DataRowVersion.Default]);
-                        AssertEquals ("#D3", (string) src.Rows [2] [1, DataRowVersion.Original], (string) target.Rows [2] [1, DataRowVersion.Original]);
-                        AssertEquals ("#D4", (string) src.Rows [2] [1, DataRowVersion.Current], (string) target.Rows [2] [1, DataRowVersion.Current]);
-
-                        // check for newly added row (4th row)
-                        AssertEquals ("#E1", (string) src.Rows [3] [1], (string) target.Rows [3] [1]);
-                        AssertEquals ("#E2", (string) src.Rows [3] [1, DataRowVersion.Default], (string) target.Rows [3] [1, DataRowVersion.Default]);
-                        AssertEquals ("#E3", (string) src.Rows [3] [1, DataRowVersion.Current], (string) target.Rows [3] [1, DataRowVersion.Current]);
-                }
-
-                [Test]
+
+               [Test]
+               public void ImportRowTest ()
+               {
+                       // build source table
+                       DataTable src = new DataTable ();
+                       src.Columns.Add ("id", typeof (int));
+                       src.Columns.Add ("name", typeof (string));
+
+                       src.PrimaryKey = new DataColumn [] {src.Columns [0]} ;
+
+                       src.Rows.Add (new object [] { 1, "mono 1" });
+                       src.Rows.Add (new object [] { 2, "mono 2" });
+                       src.Rows.Add (new object [] { 3, "mono 3" });
+                       src.AcceptChanges ();
+
+                       src.Rows [0] [1] = "mono changed 1";  // modify 1st row
+                       src.Rows [1].Delete ();              // delete 2nd row
+                       // 3rd row is unchanged
+                       src.Rows.Add (new object [] { 4, "mono 4" }); // add 4th row
+
+                       // build target table
+                       DataTable target = new DataTable ();
+                       target.Columns.Add ("id", typeof (int));
+                       target.Columns.Add ("name", typeof (string));
+
+                       target.PrimaryKey = new DataColumn [] {target.Columns [0]} ;
+
+                       // import all rows
+                       target.ImportRow (src.Rows [0]);     // import 1st row
+                       target.ImportRow (src.Rows [1]);     // import 2nd row
+                       target.ImportRow (src.Rows [2]);     // import 3rd row
+                       target.ImportRow (src.Rows [3]);     // import 4th row
+
+                       try {
+                               target.ImportRow (src.Rows [2]); // import 3rd row again
+                               Assert.Fail ("#C1");
+                       } catch (ConstraintException ex) {
+                               // Column 'id' is constrained to be unique.
+                               // Value '3' is already present
+                               Assert.AreEqual (typeof (ConstraintException), ex.GetType (), "#C2");
+                               Assert.IsNull (ex.InnerException, "#C3");
+                               Assert.IsNotNull (ex.Message, "#C4");
+                               Assert.IsTrue (ex.Message.IndexOf ("'id'") != -1, "#C5");
+                               Assert.IsTrue (ex.Message.IndexOf ("'3'") != -1, "#C6");
+                       }
+
+                       // check row states
+                       Assert.AreEqual (src.Rows [0].RowState, target.Rows [0].RowState, "#A1");
+                       Assert.AreEqual (src.Rows [1].RowState, target.Rows [1].RowState, "#A2");
+                       Assert.AreEqual (src.Rows [2].RowState, target.Rows [2].RowState, "#A3");
+                       Assert.AreEqual (src.Rows [3].RowState, target.Rows [3].RowState, "#A4");
+
+                       // check for modified row (1st row)
+                       Assert.AreEqual ((string) src.Rows [0] [1], (string) target.Rows [0] [1], "#B1");
+                       Assert.AreEqual ((string) src.Rows [0] [1, DataRowVersion.Default], (string) target.Rows [0] [1, DataRowVersion.Default], "#B2");
+                       Assert.AreEqual ((string) src.Rows [0] [1, DataRowVersion.Original], (string) target.Rows [0] [1, DataRowVersion.Original], "#B3");
+                       Assert.AreEqual ((string) src.Rows [0] [1, DataRowVersion.Current], (string) target.Rows [0] [1, DataRowVersion.Current], "#B4");
+                       Assert.IsFalse (target.Rows [0].HasVersion(DataRowVersion.Proposed), "#B5");
+
+                       // check for deleted row (2nd row)
+                       Assert.AreEqual ((string) src.Rows [1] [1, DataRowVersion.Original], (string) target.Rows [1] [1, DataRowVersion.Original], "#C1");
+
+                       // check for unchanged row (3rd row)
+                       Assert.AreEqual ((string) src.Rows [2] [1], (string) target.Rows [2] [1], "#D1");
+                       Assert.AreEqual ((string) src.Rows [2] [1, DataRowVersion.Default], (string) target.Rows [2] [1, DataRowVersion.Default], "#D2");
+                       Assert.AreEqual ((string) src.Rows [2] [1, DataRowVersion.Original], (string) target.Rows [2] [1, DataRowVersion.Original], "#D3");
+                       Assert.AreEqual ((string) src.Rows [2] [1, DataRowVersion.Current], (string) target.Rows [2] [1, DataRowVersion.Current], "#D4");
+
+                       // check for newly added row (4th row)
+                       Assert.AreEqual ((string) src.Rows [3] [1], (string) target.Rows [3] [1], "#E1");
+                       Assert.AreEqual ((string) src.Rows [3] [1, DataRowVersion.Default], (string) target.Rows [3] [1, DataRowVersion.Default], "#E2");
+                       Assert.AreEqual ((string) src.Rows [3] [1, DataRowVersion.Current], (string) target.Rows [3] [1, DataRowVersion.Current], "#E3");
+               }
+
+               [Test]
                public void ImportRowDetachedTest ()
                {
                        DataTable table = new DataTable ();
                        DataColumn col = new DataColumn ();
                        col.ColumnName = "Id";
-                       col.DataType = Type.GetType ("System.Int32");
+                       col.DataType = typeof (int);
                        table.Columns.Add (col);
 
-                        table.PrimaryKey = new DataColumn [] {col};
+                       table.PrimaryKey = new DataColumn [] {col};
 
-                        col = new DataColumn ();
+                       col = new DataColumn ();
                        col.ColumnName = "Name";
-                       col.DataType = Type.GetType ("System.String");
+                       col.DataType = typeof (string);
                        table.Columns.Add (col);
-                        
+
                        DataRow row = table.NewRow ();
                        row ["Id"] = 147;
                        row ["name"] = "Abc";
 
-                        // keep silent as ms.net ;-), though this is not useful.
-                        table.ImportRow (row);
+                       // keep silent as ms.net ;-), though this is not useful.
+                       table.ImportRow (row);
 
                        //if RowState is detached, then dont import the row.
-                       AssertEquals ("#1", 0, table.Rows.Count);
+                       Assert.AreEqual (0, table.Rows.Count, "#1");
                }
 
                [Test]
@@ -1260,11 +1271,11 @@ namespace MonoTests.System.Data
                        // row.
                        row.Delete ();
                        table.ImportRow (row);
-                       AssertEquals ("#1", 2, table.Rows.Count);
+                       Assert.AreEqual (2, table.Rows.Count, "#A1");
 
                        // Both the deleted rows shud be now gone
                        table.AcceptChanges ();
-                       AssertEquals ("#2", 0, table.Rows.Count);
+                       Assert.AreEqual (0, table.Rows.Count, "#A2");
 
                        //just add another row
                        row = table.Rows.Add (new object[] {1,2});
@@ -1275,132 +1286,205 @@ namespace MonoTests.System.Data
                        // row and validate only on RejectChanges
                        row.Delete ();
                        table.ImportRow (row);
-                       AssertEquals ("#3", 2, table.Rows.Count);
-                       AssertEquals ("#4", DataRowState.Deleted, table.Rows[1].RowState);
+                       Assert.AreEqual (2, table.Rows.Count, "#A3");
+                       Assert.AreEqual (DataRowState.Deleted, table.Rows[1].RowState, "#A4");
 
                        try {
                                table.RejectChanges ();
-                               Fail ("#5");
-                       } catch (ConstraintException e) {
+                               Assert.Fail ("#B1");
+                       } catch (ConstraintException ex) {
+                               // Column 'col' is constrained to be unique.
+                               // Value '1' is already present
+                               Assert.AreEqual (typeof (ConstraintException), ex.GetType (), "#B2");
+                               Assert.IsNull (ex.InnerException, "#B3");
+                               Assert.IsNotNull (ex.Message, "#B4");
+                               Assert.IsTrue (ex.Message.IndexOf ("'col'") != -1, "#B5");
+                               Assert.IsTrue (ex.Message.IndexOf ("'1'") != -1, "#B6");
                        }
                }
-
+               
+#if NET_4_0
+               [Test]
+               public void ImportRowTypeChangeTest ()
+               {
+                       // this is from http://bugzilla.xamarin.com/show_bug.cgi?id=2926
+       
+                       Type [] types = new Type [] { typeof (string), typeof (sbyte), typeof (byte), typeof (short), typeof (ushort), typeof (int), typeof (uint), typeof (long), typeof (ulong), typeof (float), typeof (double), typeof (char), typeof (decimal), typeof (DateTime) };
+                       object [] values = new object [] { "1", (sbyte) 1, (byte) 2, (short) 3, (ushort) 4, (int) 5, (uint) 6, (long) 7, (ulong) 8, (float) 9, (double) 10, 'z', (decimal) 13, new DateTime (24) };
+                       int length = types.Length;
+       
+                       HashSet<Tuple<Type, Type>> invalid = new HashSet<Tuple<Type, Type>> () {
+                               Tuple.Create (typeof (string), typeof (DateTime)), 
+                               Tuple.Create (typeof (sbyte), typeof (DateTime)), 
+                               Tuple.Create (typeof (byte), typeof (DateTime)), 
+                               Tuple.Create (typeof (short), typeof (DateTime)), 
+                               Tuple.Create (typeof (ushort), typeof (DateTime)), 
+                               Tuple.Create (typeof (int), typeof (DateTime)), 
+                               Tuple.Create (typeof (uint), typeof (DateTime)), 
+                               Tuple.Create (typeof (long), typeof (DateTime)), 
+                               Tuple.Create (typeof (ulong), typeof (DateTime)), 
+                               Tuple.Create (typeof (float), typeof (char)), 
+                               Tuple.Create (typeof (float), typeof (DateTime)), 
+                               Tuple.Create (typeof (double), typeof (char)), 
+                               Tuple.Create (typeof (double), typeof (DateTime)), 
+                               Tuple.Create (typeof (char), typeof (float)), 
+                               Tuple.Create (typeof (char), typeof (double)), 
+                               Tuple.Create (typeof (char), typeof (decimal)), 
+                               Tuple.Create (typeof (char), typeof (DateTime)), 
+                               Tuple.Create (typeof (Decimal), typeof (char)), 
+                               Tuple.Create (typeof (Decimal), typeof (DateTime)), 
+                               Tuple.Create (typeof (DateTime), typeof (sbyte)), 
+                               Tuple.Create (typeof (DateTime), typeof (byte)), 
+                               Tuple.Create (typeof (DateTime), typeof (short)), 
+                               Tuple.Create (typeof (DateTime), typeof (ushort)), 
+                               Tuple.Create (typeof (DateTime), typeof (int)), 
+                               Tuple.Create (typeof (DateTime), typeof (uint)), 
+                               Tuple.Create (typeof (DateTime), typeof (long)), 
+                               Tuple.Create (typeof (DateTime), typeof (ulong)), 
+                               Tuple.Create (typeof (DateTime), typeof (float)), 
+                               Tuple.Create (typeof (DateTime), typeof (double)), 
+                               Tuple.Create (typeof (DateTime), typeof (char)), 
+                               Tuple.Create (typeof (DateTime), typeof (decimal)), 
+                       };
+       
+                       for (int a = 0; a < length; a++) {
+                               for (int b = 0; b < length; b++) {
+                                       DataSet ds = new DataSet ();
+                                       DataTable dt1 = ds.Tables.Add ("T1");
+                                       DataTable dt2 = ds.Tables.Add ("T2");
+       
+                                       string name = "C-" + types [a].Name + "-to-" + types [b].Name;
+                                       dt1.Columns.Add (name, types [a]);
+                                       dt2.Columns.Add (name, types [b]);
+       
+                                       DataRow r1 = dt1.NewRow ();
+                                       dt1.Rows.Add (r1);
+       
+                                       r1 [0] = values [a];
+       
+                                       if (invalid.Contains (Tuple.Create (types [a], types [b]))) {
+                                               try {
+                                                       dt2.ImportRow (r1);
+                                                       Assert.Fail ("#B: " + name + " expected ArgumentException");
+                                               } catch /*(ArgumentException)*/ {
+                                                       continue;
+                                               }
+                                       } else {
+                                               dt2.ImportRow (r1);
+                                               DataRow r2 = dt2.Rows [0];
+                                               Assert.AreEqual (types [b], r2 [0].GetType (), "#A: " + name);
+                                       }
+                               }
+                       }
+               }
+#endif
+                       
                [Test]
                public void ClearReset () //To test Clear and Reset methods
                {
                        DataTable table = new DataTable ("table");
                        DataTable table1 = new DataTable ("table1");
-                
+
                        DataSet set = new DataSet ();
                        set.Tables.Add (table);
                        set.Tables.Add (table1);
 
-                        table.Columns.Add ("Id", typeof (int));
-                        table.Columns.Add ("Name", typeof (string));
-                        table.Constraints.Add (new UniqueConstraint ("UK1", table.Columns [0]));
-                        table.CaseSensitive = false;
-                        
-                        table1.Columns.Add ("Id", typeof (int));
-                        table1.Columns.Add ("Name", typeof (string));
+                       table.Columns.Add ("Id", typeof (int));
+                       table.Columns.Add ("Name", typeof (string));
+                       table.Constraints.Add (new UniqueConstraint ("UK1", table.Columns [0]));
+                       table.CaseSensitive = false;
+
+                       table1.Columns.Add ("Id", typeof (int));
+                       table1.Columns.Add ("Name", typeof (string));
 
-                        DataRelation dr = new DataRelation ("DR", table.Columns[0], table1.Columns[0]);
+                       DataRelation dr = new DataRelation ("DR", table.Columns[0], table1.Columns[0]);
                        set.Relations.Add (dr);
-                
+
                        DataRow row = table.NewRow ();
                        row ["Id"] = 147;
                        row ["name"] = "Roopa";
                        table.Rows.Add (row);
-                
+
                        row = table.NewRow ();
                        row ["Id"] = 47;
                        row ["Name"] = "roopa";
                        table.Rows.Add (row);
-                
-                       AssertEquals (2, table.Rows.Count);
-                       AssertEquals (1, table.ChildRelations.Count);
+
+                       Assert.AreEqual (2, table.Rows.Count);
+                       Assert.AreEqual (1, table.ChildRelations.Count);
                        try {
                                table.Reset ();
-                               Fail ("#A01, should have thrown ArgumentException");
+                               Assert.Fail ("#A01, should have thrown ArgumentException");
+                       } catch (ArgumentException) {
                        }
-                        catch (ArgumentException) {
-                       }
-                       AssertEquals ("#CT01", 0, table.Rows.Count);
-                       AssertEquals ("#CT02", 0, table.ChildRelations.Count);
-                       AssertEquals ("#CT03", 0, table.ParentRelations.Count);
-                       AssertEquals ("#CT04", 0, table.Constraints.Count);
+
+                       Assert.AreEqual (0, table.Rows.Count, "#CT01");
+                       Assert.AreEqual (0, table.ChildRelations.Count, "#CT02");
+                       Assert.AreEqual (0, table.ParentRelations.Count, "#CT03");
+                       Assert.AreEqual (0, table.Constraints.Count, "#CT04");
 
                        table1.Reset ();
-                       AssertEquals ("#A05", 0, table1.Rows.Count);
-                       AssertEquals ("#A06", 0, table1.Constraints.Count);
-                       AssertEquals ("#A07", 0, table1.ParentRelations.Count);
+                       Assert.AreEqual (0, table1.Rows.Count, "#A05");
+                       Assert.AreEqual (0, table1.Constraints.Count, "#A06");
+                       Assert.AreEqual (0, table1.ParentRelations.Count, "#A07");
                
-                        // clear test
+                       // clear test
                        table.Clear ();
-                       AssertEquals ("#A08", 0, table.Rows.Count);
-#if NET_1_1
-                       AssertEquals ("#A09", 0, table.Constraints.Count);
-#else
-                       AssertEquals ("#A09", 1, table.Constraints.Count);
-#endif
-                       AssertEquals ("#A10", 0, table.ChildRelations.Count);
-
-               }
-
-                [Test]
-                public void ClearTest ()
-                {
-                        DataTable table = new DataTable ("test");
-                        table.Columns.Add ("id", typeof (int));
-                        table.Columns.Add ("name", typeof (string));
-                        
-                        table.PrimaryKey = new DataColumn [] { table.Columns [0] } ;
-                        
-                        table.Rows.Add (new object [] { 1, "mono 1" });
-                        table.Rows.Add (new object [] { 2, "mono 2" });
-                        table.Rows.Add (new object [] { 3, "mono 3" });
-                        table.Rows.Add (new object [] { 4, "mono 4" });
-
-                        table.AcceptChanges ();
-#if NET_2_0
-                        _tableClearedEventFired = false;
-                        table.TableCleared += new DataTableClearEventHandler (OnTableCleared);
-                        _tableClearingEventFired = false;
-                        table.TableClearing += new DataTableClearEventHandler (OnTableClearing);
-#endif // NET_2_0
-                        
-                        table.Clear ();
-#if NET_2_0
-                        AssertEquals ("#3 should have fired cleared event", true, _tableClearingEventFired);
-                        AssertEquals ("#0 should have fired cleared event", true, _tableClearedEventFired);
-#endif // NET_2_0
-                        
-                        DataRow r = table.Rows.Find (1);
-                        AssertEquals ("#1 should have cleared", true, r == null);
-
-                        // try adding new row. indexes should have cleared
-                        table.Rows.Add (new object [] { 2, "mono 2" });
-                        AssertEquals ("#2 should add row", 1, table.Rows.Count);
-                }
-#if NET_2_0
-                private bool _tableClearedEventFired = false;
-                private void OnTableCleared (object src, DataTableClearEventArgs args)
-                {
-                        _tableClearedEventFired = true;
-                }
-                private bool _tableClearingEventFired = false;
-                private void OnTableClearing (object src, DataTableClearEventArgs args)
-                {
-                        _tableClearingEventFired = true;
-                }
-                private bool _tableNewRowAddedEventFired = false;
-                private void OnTableNewRowAdded (object src, DataTableNewRowEventArgs args)
-                {
-                        _tableNewRowAddedEventFired = true;
-                }
-#endif // NET_2_0
-                
-
-#if NET_2_0
+                       Assert.AreEqual (0, table.Rows.Count, "#A08");
+                       Assert.AreEqual (0, table.Constraints.Count, "#A09");
+                       Assert.AreEqual (0, table.ChildRelations.Count, "#A10");
+               }
+
+               [Test]
+               public void ClearTest ()
+               {
+                       DataTable table = new DataTable ("test");
+                       table.Columns.Add ("id", typeof (int));
+                       table.Columns.Add ("name", typeof (string));
+
+                       table.PrimaryKey = new DataColumn [] { table.Columns [0] } ;
+
+                       table.Rows.Add (new object [] { 1, "mono 1" });
+                       table.Rows.Add (new object [] { 2, "mono 2" });
+                       table.Rows.Add (new object [] { 3, "mono 3" });
+                       table.Rows.Add (new object [] { 4, "mono 4" });
+
+                       table.AcceptChanges ();
+                       _tableClearedEventFired = false;
+                       table.TableCleared += new DataTableClearEventHandler (OnTableCleared);
+                       _tableClearingEventFired = false;
+                       table.TableClearing += new DataTableClearEventHandler (OnTableClearing);
+
+                       table.Clear ();
+                       Assert.IsTrue (_tableClearingEventFired, "#3 should have fired cleared event");
+                       Assert.IsTrue (_tableClearedEventFired, "#0 should have fired cleared event");
+
+                       DataRow r = table.Rows.Find (1);
+                       Assert.IsTrue (r == null, "#1 should have cleared");
+
+                       // try adding new row. indexes should have cleared
+                       table.Rows.Add (new object [] { 2, "mono 2" });
+                       Assert.AreEqual (1, table.Rows.Count, "#2 should add row");
+               }
+
+               private bool _tableClearedEventFired;
+               private void OnTableCleared (object src, DataTableClearEventArgs args)
+               {
+                       _tableClearedEventFired = true;
+               }
+
+               private bool _tableClearingEventFired;
+               private void OnTableClearing (object src, DataTableClearEventArgs args)
+               {
+                       _tableClearingEventFired = true;
+               }
+
+               private bool _tableNewRowAddedEventFired;
+               private void OnTableNewRowAdded (object src, DataTableNewRowEventArgs args)
+               {
+                       _tableNewRowAddedEventFired = true;
+               }
+
                [Test]
                public void TestWriteXmlSchema1 ()
                {
@@ -1423,68 +1507,68 @@ namespace MonoTests.System.Data
                        string TextString = writer.ToString ();
                        string substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#01", "<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring);
-                       
+                       Assert.AreEqual ("<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring, "test#01");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#02", "<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">", substring);
+                       Assert.AreEqual ("<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">", substring, "test#02");
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#03", "  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"TestWriteXmlSchema\" msdata:UseCurrentLocale=\"true\">", substring);
+                       Assert.AreEqual ("  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"TestWriteXmlSchema\" msdata:UseCurrentLocale=\"true\">", substring, "test#03");
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#04", "    <xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("    <xs:complexType>", substring, "test#04");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#05", "      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">", substring);
-                       
+                       Assert.AreEqual ("      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">", substring, "test#05");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#06", "        <xs:element name=\"TestWriteXmlSchema\">", substring);
-                       
+                       Assert.AreEqual ("        <xs:element name=\"TestWriteXmlSchema\">", substring, "test#06");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#07", "          <xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          <xs:complexType>", substring, "test#07");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#08", "            <xs:sequence>", substring);
+                       Assert.AreEqual ("            <xs:sequence>", substring, "test#08");
                        
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#09", "              <xs:element name=\"Col1\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"Col1\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#09");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#10", "              <xs:element name=\"Col2\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"Col2\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#10");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#11", "            </xs:sequence>", substring);
-                       
+                       Assert.AreEqual ("            </xs:sequence>", substring, "test#11");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#12", "          </xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          </xs:complexType>", substring, "test#12");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#13", "        </xs:element>", substring);
-                       
-                       
+                       Assert.AreEqual ("        </xs:element>", substring, "test#13");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#14", "      </xs:choice>", substring);
+                       Assert.AreEqual ("      </xs:choice>", substring, "test#14");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#15", "    </xs:complexType>", substring);
+                       Assert.AreEqual ("    </xs:complexType>", substring, "test#15");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#16", "  </xs:element>", substring);                 
-                       AssertEquals ("test#17", "</xs:schema>", TextString);
+                       Assert.AreEqual ("  </xs:element>", substring, "test#16");
+                       Assert.AreEqual ("</xs:schema>", TextString, "test#17");
                }
+
                [Test]
                public void TestWriteXmlSchema2()
                {
@@ -1512,83 +1596,84 @@ namespace MonoTests.System.Data
                        string TextString = writer.ToString ();
                        string substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#01", "<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring);
-                       
+                       Assert.AreEqual ("<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring, "test#01");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#02", "<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">", substring);
+                       Assert.AreEqual ("<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">", substring, "test#02");
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#03", "  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"TestWriteXmlSchema\" msdata:UseCurrentLocale=\"true\">", substring);
+                       Assert.AreEqual ("  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"TestWriteXmlSchema\" msdata:UseCurrentLocale=\"true\">", substring, "test#03");
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#04", "    <xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("    <xs:complexType>", substring, "test#04");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#05", "      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">", substring);
-                       
+                       Assert.AreEqual ("      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">", substring, "test#05");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#06", "        <xs:element name=\"TestWriteXmlSchema\">", substring);
-                       
+                       Assert.AreEqual ("        <xs:element name=\"TestWriteXmlSchema\">", substring, "test#06");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#07", "          <xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          <xs:complexType>", substring, "test#07");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#08", "            <xs:sequence>", substring);
-                       
+                       Assert.AreEqual ("            <xs:sequence>", substring, "test#08");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#09", "              <xs:element name=\"Col1\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"Col1\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#09");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#10", "              <xs:element name=\"Col2\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"Col2\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#10");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#11", "            </xs:sequence>", substring);
-                       
+                       Assert.AreEqual ("            </xs:sequence>", substring, "test#11");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#12", "          </xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          </xs:complexType>", substring, "test#12");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#13", "        </xs:element>", substring);
-                       
+                       Assert.AreEqual ("        </xs:element>", substring, "test#13");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#14", "      </xs:choice>", substring);
+                       Assert.AreEqual ("      </xs:choice>", substring, "test#14");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#15", "    </xs:complexType>", substring);
+                       Assert.AreEqual ("    </xs:complexType>", substring, "test#15");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#16", "    <xs:unique name=\"Constraint1\">", substring);
+                       Assert.AreEqual ("    <xs:unique name=\"Constraint1\">", substring, "test#16");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#17", "      <xs:selector xpath=\".//TestWriteXmlSchema\" />", substring);
+                       Assert.AreEqual ("      <xs:selector xpath=\".//TestWriteXmlSchema\" />", substring, "test#17");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#18", "      <xs:field xpath=\"Col1\" />", substring);
+                       Assert.AreEqual ("      <xs:field xpath=\"Col1\" />", substring, "test#18");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#19", "    </xs:unique>", substring);
+                       Assert.AreEqual ("    </xs:unique>", substring, "test#19");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#20", "  </xs:element>", substring);                 
-                       AssertEquals ("test#21", "</xs:schema>", TextString);
+                       Assert.AreEqual ("  </xs:element>", substring, "test#20");
+                       Assert.AreEqual ("</xs:schema>", TextString, "test#21");
                }
+
                [Test]
                public void TestWriteXmlSchema3()
                {
@@ -1616,152 +1701,151 @@ namespace MonoTests.System.Data
                        string TextString = writer.ToString ();
                        string substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#01", "<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring);
-                       
+                       Assert.AreEqual ("<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring, "test#01");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#02", "<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">", substring);
+                       Assert.AreEqual ("<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">", substring, "test#02");
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#03", "  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"TestWriteXmlSchema\" msdata:UseCurrentLocale=\"true\">", substring);
+                       Assert.AreEqual ("  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"TestWriteXmlSchema\" msdata:UseCurrentLocale=\"true\">", substring, "test#03");
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#04", "    <xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("    <xs:complexType>", substring, "test#04");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#05", "      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">", substring);
-                       
+                       Assert.AreEqual ("      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">", substring, "test#05");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#06", "        <xs:element name=\"TestWriteXmlSchema\">", substring);
-                       
+                       Assert.AreEqual ("        <xs:element name=\"TestWriteXmlSchema\">", substring, "test#06");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#07", "          <xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          <xs:complexType>", substring, "test#07");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#08", "            <xs:sequence>", substring);
-                       
+                       Assert.AreEqual ("            <xs:sequence>", substring, "test#08");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#09", "              <xs:element name=\"Col1\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"Col1\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#09");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#10", "              <xs:element name=\"Col2\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"Col2\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#10");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#11", "            </xs:sequence>", substring);
-                       
+                       Assert.AreEqual ("            </xs:sequence>", substring, "test#11");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#12", "          </xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          </xs:complexType>", substring, "test#12");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#13", "        </xs:element>", substring);
-                       
+                       Assert.AreEqual ("        </xs:element>", substring, "test#13");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#14", "        <xs:element name=\"HelloWorld\">", substring);
-                       
+                       Assert.AreEqual ("        <xs:element name=\"HelloWorld\">", substring, "test#14");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#15", "          <xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          <xs:complexType>", substring, "test#15");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#16", "            <xs:sequence>", substring);
-                       
+                       Assert.AreEqual ("            <xs:sequence>", substring, "test#16");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#17", "              <xs:element name=\"T1\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"T1\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#17");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#18", "              <xs:element name=\"T2\" type=\"xs:int\" minOccurs=\"0\" />", substring);
+                       Assert.AreEqual ("              <xs:element name=\"T2\" type=\"xs:int\" minOccurs=\"0\" />", substring, "test#18");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#19", "            </xs:sequence>", substring);
-                       
+                       Assert.AreEqual ("            </xs:sequence>", substring, "test#19");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#20", "          </xs:complexType>", substring);
-                       
+                       Assert.AreEqual ("          </xs:complexType>", substring, "test#20");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#21", "        </xs:element>", substring);
-                       
+                       Assert.AreEqual ("        </xs:element>", substring, "test#21");
+
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#22", "      </xs:choice>", substring);
+                       Assert.AreEqual ("      </xs:choice>", substring, "test#22");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#23", "    </xs:complexType>", substring);
+                       Assert.AreEqual ("    </xs:complexType>", substring, "test#23");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#24", "    <xs:unique name=\"Constraint1\">", substring);
+                       Assert.AreEqual ("    <xs:unique name=\"Constraint1\">", substring, "test#24");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#25", "      <xs:selector xpath=\".//TestWriteXmlSchema\" />", substring);
+                       Assert.AreEqual ("      <xs:selector xpath=\".//TestWriteXmlSchema\" />", substring, "test#25");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#26", "      <xs:field xpath=\"Col1\" />", substring);
+                       Assert.AreEqual ("      <xs:field xpath=\"Col1\" />", substring, "test#26");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#27", "    </xs:unique>", substring);
+                       Assert.AreEqual ("    </xs:unique>", substring, "test#27");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#28", "    <xs:keyref name=\"Relation1\" refer=\"Constraint1\">", substring);
+                       Assert.AreEqual ("    <xs:keyref name=\"Relation1\" refer=\"Constraint1\">", substring, "test#28");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#29", "      <xs:selector xpath=\".//HelloWorld\" />", substring);
+                       Assert.AreEqual ("      <xs:selector xpath=\".//HelloWorld\" />", substring, "test#29");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#30", "      <xs:field xpath=\"T1\" />", substring);
+                       Assert.AreEqual ("      <xs:field xpath=\"T1\" />", substring, "test#30");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#31", "    </xs:keyref>", substring);
+                       Assert.AreEqual ("    </xs:keyref>", substring, "test#31");
 
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);
-                       AssertEquals ("test#32", "  </xs:element>", substring);                 
-                       AssertEquals ("test#33", "</xs:schema>", TextString);
+                       Assert.AreEqual ("  </xs:element>", substring, "test#32");
+                       Assert.AreEqual ("</xs:schema>", TextString, "test#33");
                }
-#endif
+
                [Test]
                public void Serialize ()
                {
                        MemoryStream fs = new MemoryStream ();
-                       
+
                        // Construct a BinaryFormatter and use it 
                        // to serialize the data to the stream.
                        BinaryFormatter formatter = new BinaryFormatter();
-               
+
                        // Create an array with multiple elements refering to 
                        // the one Singleton object.
                        DataTable dt = new DataTable();
-               
-               
+
                        dt.Columns.Add(new DataColumn("Id", typeof(string)));
                        dt.Columns.Add(new DataColumn("ContactName", typeof(string)));
                        dt.Columns.Add(new DataColumn("ContactTitle", typeof(string)));
                        dt.Columns.Add(new DataColumn("ContactAreaCode", typeof(string)));
                        dt.Columns.Add(new DataColumn("ContactPhone", typeof(string)));
-               
+
                        DataRow loRowToAdd;
                        loRowToAdd = dt.NewRow();
                        loRowToAdd[0] = "a";
@@ -1769,30 +1853,28 @@ namespace MonoTests.System.Data
                        loRowToAdd[2] = "c";
                        loRowToAdd[3] = "d";
                        loRowToAdd[4] = "e";
-                                               
                        dt.Rows.Add(loRowToAdd);
-               
+
                        DataTable[] dtarr = new DataTable[] {dt}; 
-               
+
                        // Serialize the array elements.
                        formatter.Serialize(fs, dtarr);
-               
+
                        // Deserialize the array elements.
                        fs.Position = 0;
                        DataTable[] a2 = (DataTable[]) formatter.Deserialize(fs);
-               
+
                        DataSet ds = new DataSet();
                        ds.Tables.Add(a2[0]);
-               
+
                        StringWriter sw = new StringWriter ();
                        ds.WriteXml(sw);
                        XmlDocument doc = new XmlDocument ();
                        doc.LoadXml (sw.ToString ());
-                       AssertEquals (5, doc.DocumentElement.FirstChild.ChildNodes.Count);
+                       Assert.AreEqual (5, doc.DocumentElement.FirstChild.ChildNodes.Count);
                }
 
                [Test]
-               [ExpectedException (typeof (DataException))]
                public void SetPrimaryKeyAssertsNonNull ()
                {
                        DataTable dt = new DataTable ("table");
@@ -1802,11 +1884,14 @@ namespace MonoTests.System.Data
                        dt.Rows.Add (new object [] {1, 3});
                        dt.Rows.Add (new object [] {DBNull.Value, 3});
 
-                       dt.PrimaryKey = new DataColumn [] {dt.Columns [0]};
+                       try {
+                               dt.PrimaryKey = new DataColumn [] { dt.Columns [0] };
+                               Assert.Fail ("#1");
+                       } catch (DataException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (NoNullAllowedException))]
                public void PrimaryKeyColumnChecksNonNull ()
                {
                        DataTable dt = new DataTable ("table");
@@ -1815,7 +1900,12 @@ namespace MonoTests.System.Data
                        dt.Constraints.Add (new UniqueConstraint (dt.Columns [0]));
                        dt.PrimaryKey = new DataColumn [] {dt.Columns [0]};
                        dt.Rows.Add (new object [] {1, 3});
-                       dt.Rows.Add (new object [] {DBNull.Value, 3});
+
+                       try {
+                               dt.Rows.Add (new object [] { DBNull.Value, 3 });
+                               Assert.Fail ("#1");
+                       } catch (NoNullAllowedException) {
+                       }
                }
 
                [Test]
@@ -1825,28 +1915,28 @@ namespace MonoTests.System.Data
                        DataColumn col1 = table.Columns.Add ("col1", typeof (int));
                        DataColumn col2 = table.Columns.Add ("col2", typeof (int));
        
-                       AssertEquals ("#1" , true, col1.AllowDBNull);
-                       AssertEquals ("#2" , true, col2.AllowDBNull);
-                       AssertEquals ("#3" , false, col2.Unique);
-                       AssertEquals ("#4" , false, col2.Unique);
+                       Assert.IsTrue (col1.AllowDBNull, "#1" );
+                       Assert.IsTrue (col2.AllowDBNull, "#2" );
+                       Assert.IsFalse (col2.Unique, "#3" );
+                       Assert.IsFalse (col2.Unique, "#4" );
 
                        table.PrimaryKey = new DataColumn[] {col1,col2};
-                       AssertEquals ("#5" , false, col1.AllowDBNull);
-                       AssertEquals ("#6" , false, col2.AllowDBNull);
+                       Assert.IsFalse (col1.AllowDBNull, "#5" );
+                       Assert.IsFalse (col2.AllowDBNull, "#6" );
                        // LAMESPEC or bug ?? 
-                       AssertEquals ("#7" , false, col1.Unique);
-                       AssertEquals ("#8" , false, col2.Unique);
+                       Assert.IsFalse (col1.Unique, "#7" );
+                       Assert.IsFalse (col2.Unique, "#8" );
                }
 
                void RowChanging (object o, DataRowChangeEventArgs e)
                {
-                       AssertEquals ("changing.Action", rowChangingExpectedAction, e.Action);
+                       Assert.AreEqual (rowChangingExpectedAction, e.Action, "changing.Action");
                        rowChangingRowChanging = true;
                }
 
                void RowChanged (object o, DataRowChangeEventArgs e)
                {
-                       AssertEquals ("changed.Action", rowChangingExpectedAction, e.Action);
+                       Assert.AreEqual (rowChangingExpectedAction, e.Action, "changed.Action");
                        rowChangingRowChanged = true;
                }
 
@@ -1863,74 +1953,74 @@ namespace MonoTests.System.Data
                        dt.RowChanged += new DataRowChangeEventHandler (RowChanged);
                        rowChangingExpectedAction = DataRowAction.Add;
                        dt.Rows.Add (new object [] {1, 2});
-                       Assert ("changing,Added", rowChangingRowChanging);
-                       Assert ("changed,Added", rowChangingRowChanged);
+                       Assert.IsTrue (rowChangingRowChanging, "changing,Added");
+                       Assert.IsTrue (rowChangingRowChanged, "changed,Added");
                        rowChangingExpectedAction = DataRowAction.Change;
                        dt.Rows [0] [0] = 2;
-                       Assert ("changing,Changed", rowChangingRowChanging);
-                       Assert ("changed,Changed", rowChangingRowChanged);
+                       Assert.IsTrue (rowChangingRowChanging, "changing,Changed");
+                       Assert.IsTrue (rowChangingRowChanged, "changed,Changed");
                }
 
-                [Test]
-                public void CloneSubClassTest()
-                {
-                        MyDataTable dt1 = new MyDataTable();
-                        MyDataTable dt = (MyDataTable)(dt1.Clone());
-                        AssertEquals("A#01",2,MyDataTable.count);
-                }
-
-                DataRowAction rowActionChanging = DataRowAction.Nothing;
-                DataRowAction rowActionChanged  = DataRowAction.Nothing;
-                [Test]
-                public void AcceptChangesTest ()
-                {
-                        DataTable dt = new DataTable ("test");
-                        dt.Columns.Add ("id", typeof (int));
-                        dt.Columns.Add ("name", typeof (string));
-                        
-                        dt.Rows.Add (new object [] { 1, "mono 1" });
-
-                        dt.RowChanged  += new DataRowChangeEventHandler (OnRowChanged);
-                        dt.RowChanging += new DataRowChangeEventHandler (OnRowChanging);
+               [Test]
+               public void CloneSubClassTest()
+               {
+                       MyDataTable dt1 = new MyDataTable();
+                       MyDataTable dt = (MyDataTable)(dt1.Clone());
+                       Assert.AreEqual (2, MyDataTable.count, "A#01");
+               }
 
-                        try {
-                                rowActionChanged = rowActionChanging = DataRowAction.Nothing;
-                                dt.AcceptChanges ();
+               DataRowAction rowActionChanging = DataRowAction.Nothing;
+               DataRowAction rowActionChanged  = DataRowAction.Nothing;
+               [Test]
+               public void AcceptChangesTest ()
+               {
+                       DataTable dt = new DataTable ("test");
+                       dt.Columns.Add ("id", typeof (int));
+                       dt.Columns.Add ("name", typeof (string));
 
-                                AssertEquals ("#1 should have fired event and set action to commit",
-                                              DataRowAction.Commit, rowActionChanging);
-                                AssertEquals ("#2 should have fired event and set action to commit",
-                                              DataRowAction.Commit, rowActionChanged);
+                       dt.Rows.Add (new object [] { 1, "mono 1" });
 
-                        } finally {
-                                dt.RowChanged  -= new DataRowChangeEventHandler (OnRowChanged);
-                                dt.RowChanging -= new DataRowChangeEventHandler (OnRowChanging);
+                       dt.RowChanged  += new DataRowChangeEventHandler (OnRowChanged);
+                       dt.RowChanging += new DataRowChangeEventHandler (OnRowChanging);
 
-                        }
-                }
+                       try {
+                               rowActionChanged = rowActionChanging = DataRowAction.Nothing;
+                               dt.AcceptChanges ();
+
+                               Assert.AreEqual (DataRowAction.Commit, rowActionChanging,
+                                                "#1 should have fired event and set action to commit");
+                               Assert.AreEqual (DataRowAction.Commit, rowActionChanged,
+                                                "#2 should have fired event and set action to commit");
+                       } finally {
+                               dt.RowChanged  -= new DataRowChangeEventHandler (OnRowChanged);
+                               dt.RowChanging -= new DataRowChangeEventHandler (OnRowChanging);
+                       }
+               }
 
                [Test]
                public void ColumnObjectTypeTest() {
                        DataTable dt = new DataTable();
                        dt.Columns.Add("Series Label", typeof(SqlInt32));
                        dt.Rows.Add(new object[] {"sss"});
-                       AssertEquals(1, dt.Rows.Count);
+                       Assert.AreEqual (1, dt.Rows.Count);
                }
 
-#if NET_2_0
                private bool tableInitialized;
                [Test]
-               public void TableInitializedEventTest1 () {
+               public void TableInitializedEventTest1 ()
+               {
                        DataTable dt = new DataTable();
                        tableInitialized = false;
                        dt.Initialized += new EventHandler (OnTableInitialized);
                        dt.Columns.Add("Series Label", typeof(SqlInt32));
                        dt.Rows.Add(new object[] {"sss"});
-                       AssertEquals("TableInitialized #01", tableInitialized, false);
+                       Assert.IsFalse (tableInitialized, "TableInitialized #01");
                        dt.Initialized -= new EventHandler (OnTableInitialized);
                }
+
                [Test]
-               public void TableInitializedEventTest2 () {
+               public void TableInitializedEventTest2 ()
+               {
                        DataTable dt = new DataTable();
                        dt.BeginInit ();
                        tableInitialized = false;
@@ -1939,52 +2029,53 @@ namespace MonoTests.System.Data
                        dt.Rows.Add(new object[] {"sss"});
                        dt.EndInit ();
                        dt.Initialized -= new EventHandler (OnTableInitialized);
-                       AssertEquals("TableInitialized #02", tableInitialized, true);
+                       Assert.IsTrue (tableInitialized, "TableInitialized #02");
                }
+
                [Test]
-               public void TableInitializedEventTest3 () {
+               public void TableInitializedEventTest3 ()
+               {
                        DataTable dt = new DataTable();
                        tableInitialized = true;
                        dt.Initialized += new EventHandler (OnTableInitialized);
                        dt.Columns.Add("Series Label", typeof(SqlInt32));
                        dt.Rows.Add(new object[] {"sss"});
-                       AssertEquals("TableInitialized #03", tableInitialized, dt.IsInitialized);
+                       Assert.AreEqual (tableInitialized, dt.IsInitialized, "TableInitialized #03");
                        dt.Initialized -= new EventHandler (OnTableInitialized);
                }
+
                [Test]
-               public void TableInitializedEventTest4 () {
+               public void TableInitializedEventTest4 ()
+               {
                        DataTable dt = new DataTable();
-                       AssertEquals("TableInitialized #04", true, dt.IsInitialized);
+                       Assert.IsTrue (dt.IsInitialized, "TableInitialized #04");
                        dt.BeginInit ();
                        tableInitialized = false;
                        dt.Initialized += new EventHandler (OnTableInitialized);
                        dt.Columns.Add("Series Label", typeof(SqlInt32));
                        dt.Rows.Add(new object[] {"sss"});
-                       AssertEquals("TableInitialized #05", false, dt.IsInitialized);
+                       Assert.IsFalse (dt.IsInitialized, "TableInitialized #05");
                        dt.EndInit ();
-                       NUnit.Framework.Assert.IsTrue (dt.IsInitialized, "TableInitialized #06");
-                       NUnit.Framework.Assert.IsTrue (tableInitialized, "TableInitialized #07");
+                       Assert.IsTrue (dt.IsInitialized, "TableInitialized #06");
+                       Assert.IsTrue (tableInitialized, "TableInitialized #07");
                        dt.Initialized -= new EventHandler (OnTableInitialized);
                }
 
-                private void OnTableInitialized (object src, EventArgs args)
-                {
+               private void OnTableInitialized (object src, EventArgs args)
+               {
                        tableInitialized = true;
                }
 
-#endif
+               public void OnRowChanging (object src, DataRowChangeEventArgs args)
+               {
+                       rowActionChanging = args.Action;
+               }
 
-                public void OnRowChanging (object src, DataRowChangeEventArgs args)
-                {
-                        rowActionChanging = args.Action;
-                }
-                
-                public void OnRowChanged (object src, DataRowChangeEventArgs args)
-                {
-                        rowActionChanged = args.Action;
+               public void OnRowChanged (object src, DataRowChangeEventArgs args)
+               {
+                       rowActionChanged = args.Action;
                }
 
-#if NET_2_0
                private DataTable dt;
                private void localSetup () {
                        dt = new DataTable ("test");
@@ -2002,36 +2093,37 @@ namespace MonoTests.System.Data
                #region DataTable.CreateDataReader Tests
 
                [Test]
-               public void CreateDataReader1 () {
+               public void CreateDataReader1 ()
+               {
                        localSetup ();
                        DataTableReader dtr = dt.CreateDataReader ();
-                       Assert ("HasRows", dtr.HasRows);
-                       AssertEquals ("CountCols", dt.Columns.Count, dtr.FieldCount);
+                       Assert.IsTrue (dtr.HasRows, "HasRows");
+                       Assert.AreEqual (dt.Columns.Count, dtr.FieldCount, "CountCols");
                        int ri = 0;
                        while (dtr.Read ()) {
                                for (int i = 0; i < dtr.FieldCount; i++) {
-                                       AssertEquals ("RowData-" + ri + "-" + i, dt.Rows[ri][i],
-                                               dtr[i]);
+                                       Assert.AreEqual (dt.Rows[ri][i], dtr[i], "RowData-" + ri + "-" + i);
                                }
                                ri++;
                        }
                }
 
                [Test]
-               public void CreateDataReader2 () {
+               public void CreateDataReader2 ()
+               {
                        localSetup ();
                        DataTableReader dtr = dt.CreateDataReader ();
-                       Assert ("HasRows", dtr.HasRows);
-                       AssertEquals ("CountCols", dt.Columns.Count, dtr.FieldCount);
+                       Assert.IsTrue (dtr.HasRows, "HasRows");
+                       Assert.AreEqual (dt.Columns.Count, dtr.FieldCount, "CountCols");
                        dtr.Read ();
-                       AssertEquals ("RowData0-0", 1, dtr[0]);
-                       AssertEquals ("RowData0-1", "mono 1", dtr[1]);
+                       Assert.AreEqual (1, dtr[0], "RowData0-0");
+                       Assert.AreEqual ("mono 1", dtr[1], "RowData0-1");
                        dtr.Read ();
-                       AssertEquals ("RowData1-0", 2, dtr[0]);
-                       AssertEquals ("RowData1-1", "mono 2", dtr[1]);
+                       Assert.AreEqual (2, dtr[0], "RowData1-0");
+                       Assert.AreEqual ("mono 2", dtr[1], "RowData1-1");
                        dtr.Read ();
-                       AssertEquals ("RowData2-0", 3, dtr[0]);
-                       AssertEquals ("RowData2-1", "mono 3", dtr[1]);
+                       Assert.AreEqual (3, dtr[0], "RowData2-0");
+                       Assert.AreEqual ("mono 3", dtr[1], "RowData2-1");
                }
 
                #endregion // DataTable.CreateDataReader Tests
@@ -2039,7 +2131,8 @@ namespace MonoTests.System.Data
                #region DataTable.Load Tests
 
                [Test]
-               public void Load_Basic () {
+               public void Load_Basic ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadBasic");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2053,38 +2146,42 @@ namespace MonoTests.System.Data
                        dtLoad.AcceptChanges ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr);
-                       AssertEquals ("NColumns", 2, dtLoad.Columns.Count);
-                       AssertEquals ("NRows", 3, dtLoad.Rows.Count);
-                       AssertEquals ("RowData0-0", 1, dtLoad.Rows[0][0]);
-                       AssertEquals ("RowData0-1", "mono 1", dtLoad.Rows[0][1]);
-                       AssertEquals ("RowData1-0", 2, dtLoad.Rows[1][0]);
-                       AssertEquals ("RowData1-1", "mono 2", dtLoad.Rows[1][1]);
-                       AssertEquals ("RowData2-0", 3, dtLoad.Rows[2][0]);
-                       AssertEquals ("RowData2-1", "mono 3", dtLoad.Rows[2][1]);
+                       Assert.AreEqual (2, dtLoad.Columns.Count, "NColumns");
+                       Assert.AreEqual (3, dtLoad.Rows.Count, "NRows");
+                       Assert.AreEqual (1, dtLoad.Rows[0][0], "RowData0-0");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1], "RowData0-1");
+                       Assert.AreEqual (2, dtLoad.Rows[1][0], "RowData1-0");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1], "RowData1-1");
+                       Assert.AreEqual (3, dtLoad.Rows[2][0], "RowData2-0");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[2][1], "RowData2-1");
                }
 
                [Test]
-               public void Load_NoSchema () {
+               public void Load_NoSchema ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadNoSchema");
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr);
-                       AssertEquals ("NColumns", 2, dtLoad.Columns.Count);
-                       AssertEquals ("NRows", 3, dtLoad.Rows.Count);
-                       AssertEquals ("RowData0-0", 1, dtLoad.Rows[0][0]);
-                       AssertEquals ("RowData0-1", "mono 1", dtLoad.Rows[0][1]);
-                       AssertEquals ("RowData1-0", 2, dtLoad.Rows[1][0]);
-                       AssertEquals ("RowData1-1", "mono 2", dtLoad.Rows[1][1]);
-                       AssertEquals ("RowData2-0", 3, dtLoad.Rows[2][0]);
-                       AssertEquals ("RowData2-1", "mono 3", dtLoad.Rows[2][1]);
+                       Assert.AreEqual (2, dtLoad.Columns.Count, "NColumns");
+                       Assert.AreEqual (3, dtLoad.Rows.Count, "NRows");
+                       Assert.AreEqual (1, dtLoad.Rows[0][0], "RowData0-0");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1], "RowData0-1");
+                       Assert.AreEqual (2, dtLoad.Rows[1][0], "RowData1-0");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1], "RowData1-1");
+                       Assert.AreEqual (3, dtLoad.Rows[2][0], "RowData2-0");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[2][1], "RowData2-1");
                }
 
-               internal struct fillErrorStruct {
+               internal struct fillErrorStruct
+               {
                        internal string error;
                        internal string tableName;
                        internal int rowKey;
                        internal bool contFlag;
-                       internal void init (string tbl, int row, bool cont, string err) {
+
+                       internal void init (string tbl, int row, bool cont, string err)
+                       {
                                tableName = tbl;
                                rowKey = row;
                                contFlag = cont;
@@ -2093,28 +2190,34 @@ namespace MonoTests.System.Data
                }
                private fillErrorStruct[] fillErr = new fillErrorStruct[3];
                private int fillErrCounter;
-               private void fillErrorHandler (object sender, FillErrorEventArgs e) {
+               private void fillErrorHandler (object sender, FillErrorEventArgs e)
+               {
                        e.Continue = fillErr[fillErrCounter].contFlag;
-                       AssertEquals ("fillErr-T", fillErr[fillErrCounter].tableName, e.DataTable.TableName);
-                       //AssertEquals ("fillErr-R", fillErr[fillErrCounter].rowKey, e.Values[0]);
-                       AssertEquals ("fillErr-C", fillErr[fillErrCounter].contFlag, e.Continue);
-                       //AssertEquals ("fillErr-E", fillErr[fillErrCounter].error, e.Errors.Message);
+                       Assert.AreEqual (fillErr[fillErrCounter].tableName, e.DataTable.TableName, "fillErr-T");
+                       //Assert.AreEqual (fillErr[fillErrCounter].rowKey, e.Values[0], "fillErr-R");
+                       Assert.AreEqual (fillErr[fillErrCounter].contFlag, e.Continue, "fillErr-C");
+                       //Assert.AreEqual (fillErr[fillErrCounter].error, e.Errors.Message, "fillErr-E");
                        fillErrCounter++;
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void Load_Incompatible () {
+               public void Load_Incompatible ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadIncompatible");
                        dtLoad.Columns.Add ("name", typeof (double));
                        DataTableReader dtr = dt.CreateDataReader ();
-                       dtLoad.Load (dtr);
+                       try {
+                               dtLoad.Load (dtr);
+                               Assert.Fail ("#1");
+                       } catch (ArgumentException) {
+                       }
                }
                [Test]
                // Load doesn't have a third overload in System.Data
                // and is commented-out below
-               public void Load_IncompatibleEHandlerT () {
+               public void Load_IncompatibleEHandlerT ()
+               {
                        fillErrCounter = 0;
                        fillErr[0].init ("LoadIncompatible", 1, true,
                                 "Input string was not in a correct format.Couldn't store <mono 1> in name Column.  Expected type is Double.");
@@ -2128,11 +2231,12 @@ namespace MonoTests.System.Data
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr,LoadOption.PreserveChanges,fillErrorHandler);
                }
+
                [Test]
                // Load doesn't have a third overload in System.Data
                // and is commented-out below
-               [ExpectedException (typeof (ArgumentException))]
-               public void Load_IncompatibleEHandlerF () {
+               public void Load_IncompatibleEHandlerF ()
+               {
                        fillErrCounter = 0;
                        fillErr[0].init ("LoadIncompatible", 1, false,
                                "Input string was not in a correct format.Couldn't store <mono 1> in name Column.  Expected type is Double.");
@@ -2140,11 +2244,16 @@ namespace MonoTests.System.Data
                        DataTable dtLoad = new DataTable ("LoadIncompatible");
                        dtLoad.Columns.Add ("name", typeof (double));
                        DataTableReader dtr = dt.CreateDataReader ();
-                       dtLoad.Load (dtr, LoadOption.PreserveChanges, fillErrorHandler);
+                       try {
+                               dtLoad.Load (dtr, LoadOption.PreserveChanges, fillErrorHandler);
+                               Assert.Fail ("#1");
+                       } catch (ArgumentException) {
+                       }
                }
 
                [Test]
-               public void Load_ExtraColsEqualVal () {
+               public void Load_ExtraColsEqualVal ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadExtraCols");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2155,18 +2264,19 @@ namespace MonoTests.System.Data
                        dtLoad.AcceptChanges ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr);
-                       AssertEquals ("NColumns", 2, dtLoad.Columns.Count);
-                       AssertEquals ("NRows", 3, dtLoad.Rows.Count);
-                       AssertEquals ("RowData0-0", 1, dtLoad.Rows[0][0]);
-                       AssertEquals ("RowData0-1", "mono 1", dtLoad.Rows[0][1]);
-                       AssertEquals ("RowData1-0", 2, dtLoad.Rows[1][0]);
-                       AssertEquals ("RowData1-1", "mono 2", dtLoad.Rows[1][1]);
-                       AssertEquals ("RowData2-0", 3, dtLoad.Rows[2][0]);
-                       AssertEquals ("RowData2-1", "mono 3", dtLoad.Rows[2][1]);
+                       Assert.AreEqual (2, dtLoad.Columns.Count, "NColumns");
+                       Assert.AreEqual (3, dtLoad.Rows.Count, "NRows");
+                       Assert.AreEqual (1, dtLoad.Rows[0][0], "RowData0-0");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1], "RowData0-1");
+                       Assert.AreEqual (2, dtLoad.Rows[1][0], "RowData1-0");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1], "RowData1-1");
+                       Assert.AreEqual (3, dtLoad.Rows[2][0], "RowData2-0");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[2][1], "RowData2-1");
                }
 
                [Test]
-               public void Load_ExtraColsNonEqualVal () {
+               public void Load_ExtraColsNonEqualVal ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadExtraCols");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2177,22 +2287,22 @@ namespace MonoTests.System.Data
                        dtLoad.AcceptChanges ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr);
-                       AssertEquals ("NColumns", 2, dtLoad.Columns.Count);
-                       AssertEquals ("NRows", 6, dtLoad.Rows.Count);
-                       AssertEquals ("RowData0-0", 4, dtLoad.Rows[0][0]);
-                       AssertEquals ("RowData1-0", 5, dtLoad.Rows[1][0]);
-                       AssertEquals ("RowData2-0", 6, dtLoad.Rows[2][0]);
-                       AssertEquals ("RowData3-0", 1, dtLoad.Rows[3][0]);
-                       AssertEquals ("RowData3-1", "mono 1", dtLoad.Rows[3][1]);
-                       AssertEquals ("RowData4-0", 2, dtLoad.Rows[4][0]);
-                       AssertEquals ("RowData4-1", "mono 2", dtLoad.Rows[4][1]);
-                       AssertEquals ("RowData5-0", 3, dtLoad.Rows[5][0]);
-                       AssertEquals ("RowData5-1", "mono 3", dtLoad.Rows[5][1]);
-               }
-
-               [Test]
-               [ExpectedException (typeof (ConstraintException))]
-               public void Load_MissingColsNonNullable () {
+                       Assert.AreEqual (2, dtLoad.Columns.Count, "NColumns");
+                       Assert.AreEqual (6, dtLoad.Rows.Count, "NRows");
+                       Assert.AreEqual (4, dtLoad.Rows[0][0], "RowData0-0");
+                       Assert.AreEqual (5, dtLoad.Rows[1][0], "RowData1-0");
+                       Assert.AreEqual (6, dtLoad.Rows[2][0], "RowData2-0");
+                       Assert.AreEqual (1, dtLoad.Rows[3][0], "RowData3-0");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[3][1], "RowData3-1");
+                       Assert.AreEqual (2, dtLoad.Rows[4][0], "RowData4-0");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[4][1], "RowData4-1");
+                       Assert.AreEqual (3, dtLoad.Rows[5][0], "RowData5-0");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[5][1], "RowData5-1");
+               }
+
+               [Test]
+               public void Load_MissingColsNonNullable ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadMissingCols");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2205,11 +2315,16 @@ namespace MonoTests.System.Data
                        dtLoad.Rows.Add (new object[] { 6, "mono 6", "miss6" });
                        dtLoad.AcceptChanges ();
                        DataTableReader dtr = dt.CreateDataReader ();
-                       dtLoad.Load (dtr);
+                       try {
+                               dtLoad.Load (dtr);
+                               Assert.Fail ("#1");
+                       } catch (ConstraintException) {
+                       }
                }
 
                [Test]
-               public void Load_MissingColsDefault () {
+               public void Load_MissingColsDefault ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadMissingCols");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2224,30 +2339,31 @@ namespace MonoTests.System.Data
                        dtLoad.AcceptChanges ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr);
-                       AssertEquals ("NColumns", 3, dtLoad.Columns.Count);
-                       AssertEquals ("NRows", 6, dtLoad.Rows.Count);
-                       AssertEquals ("RowData0-0", 4, dtLoad.Rows[0][0]);
-                       AssertEquals ("RowData0-1", "mono 4", dtLoad.Rows[0][1]);
-                       AssertEquals ("RowData0-2", "miss4", dtLoad.Rows[0][2]);
-                       AssertEquals ("RowData1-0", 5, dtLoad.Rows[1][0]);
-                       AssertEquals ("RowData1-1", "mono 5", dtLoad.Rows[1][1]);
-                       AssertEquals ("RowData1-2", "miss5", dtLoad.Rows[1][2]);
-                       AssertEquals ("RowData2-0", 6, dtLoad.Rows[2][0]);
-                       AssertEquals ("RowData2-1", "mono 6", dtLoad.Rows[2][1]);
-                       AssertEquals ("RowData2-2", "miss6", dtLoad.Rows[2][2]);
-                       AssertEquals ("RowData3-0", 1, dtLoad.Rows[3][0]);
-                       AssertEquals ("RowData3-1", "mono 1", dtLoad.Rows[3][1]);
-                       AssertEquals ("RowData3-2", "DefaultValue", dtLoad.Rows[3][2]);
-                       AssertEquals ("RowData4-0", 2, dtLoad.Rows[4][0]);
-                       AssertEquals ("RowData4-1", "mono 2", dtLoad.Rows[4][1]);
-                       AssertEquals ("RowData4-2", "DefaultValue", dtLoad.Rows[4][2]);
-                       AssertEquals ("RowData5-0", 3, dtLoad.Rows[5][0]);
-                       AssertEquals ("RowData5-1", "mono 3", dtLoad.Rows[5][1]);
-                       AssertEquals ("RowData5-2", "DefaultValue", dtLoad.Rows[5][2]);
-               }
-
-               [Test]
-               public void Load_MissingColsNullable () {
+                       Assert.AreEqual (3, dtLoad.Columns.Count, "NColumns");
+                       Assert.AreEqual (6, dtLoad.Rows.Count, "NRows");
+                       Assert.AreEqual (4, dtLoad.Rows[0][0], "RowData0-0");
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[0][1], "RowData0-1");
+                       Assert.AreEqual ("miss4", dtLoad.Rows[0][2], "RowData0-2");
+                       Assert.AreEqual (5, dtLoad.Rows[1][0], "RowData1-0");
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[1][1], "RowData1-1");
+                       Assert.AreEqual ("miss5", dtLoad.Rows[1][2], "RowData1-2");
+                       Assert.AreEqual (6, dtLoad.Rows[2][0], "RowData2-0");
+                       Assert.AreEqual ("mono 6", dtLoad.Rows[2][1], "RowData2-1");
+                       Assert.AreEqual ("miss6", dtLoad.Rows[2][2], "RowData2-2");
+                       Assert.AreEqual (1, dtLoad.Rows[3][0], "RowData3-0");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[3][1], "RowData3-1");
+                       Assert.AreEqual ("DefaultValue", dtLoad.Rows[3][2], "RowData3-2");
+                       Assert.AreEqual (2, dtLoad.Rows[4][0], "RowData4-0");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[4][1], "RowData4-1");
+                       Assert.AreEqual ("DefaultValue", dtLoad.Rows[4][2], "RowData4-2");
+                       Assert.AreEqual (3, dtLoad.Rows[5][0], "RowData5-0");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[5][1], "RowData5-1");
+                       Assert.AreEqual ("DefaultValue", dtLoad.Rows[5][2], "RowData5-2");
+               }
+
+               [Test]
+               public void Load_MissingColsNullable ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadMissingCols");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2261,29 +2377,30 @@ namespace MonoTests.System.Data
                        dtLoad.AcceptChanges ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr);
-                       AssertEquals ("NColumns", 3, dtLoad.Columns.Count);
-                       AssertEquals ("NRows", 6, dtLoad.Rows.Count);
-                       AssertEquals ("RowData0-0", 4, dtLoad.Rows[0][0]);
-                       AssertEquals ("RowData0-1", "mono 4", dtLoad.Rows[0][1]);
-                       AssertEquals ("RowData0-2", "miss4", dtLoad.Rows[0][2]);
-                       AssertEquals ("RowData1-0", 5, dtLoad.Rows[1][0]);
-                       AssertEquals ("RowData1-1", "mono 5", dtLoad.Rows[1][1]);
-                       AssertEquals ("RowData1-2", "miss5", dtLoad.Rows[1][2]);
-                       AssertEquals ("RowData2-0", 6, dtLoad.Rows[2][0]);
-                       AssertEquals ("RowData2-1", "mono 6", dtLoad.Rows[2][1]);
-                       AssertEquals ("RowData2-2", "miss6", dtLoad.Rows[2][2]);
-                       AssertEquals ("RowData3-0", 1, dtLoad.Rows[3][0]);
-                       AssertEquals ("RowData3-1", "mono 1", dtLoad.Rows[3][1]);
-                       //AssertEquals ("RowData3-2", null, dtLoad.Rows[3][2]);
-                       AssertEquals ("RowData4-0", 2, dtLoad.Rows[4][0]);
-                       AssertEquals ("RowData4-1", "mono 2", dtLoad.Rows[4][1]);
-                       //AssertEquals ("RowData4-2", null, dtLoad.Rows[4][2]);
-                       AssertEquals ("RowData5-0", 3, dtLoad.Rows[5][0]);
-                       AssertEquals ("RowData5-1", "mono 3", dtLoad.Rows[5][1]);
-                       //AssertEquals ("RowData5-2", null, dtLoad.Rows[5][2]);
-               }
-
-               private DataTable setupRowState () {
+                       Assert.AreEqual (3, dtLoad.Columns.Count, "NColumns");
+                       Assert.AreEqual (6, dtLoad.Rows.Count, "NRows");
+                       Assert.AreEqual (4, dtLoad.Rows[0][0], "RowData0-0");
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[0][1], "RowData0-1");
+                       Assert.AreEqual ("miss4", dtLoad.Rows[0][2], "RowData0-2");
+                       Assert.AreEqual (5, dtLoad.Rows[1][0], "RowData1-0");
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[1][1], "RowData1-1");
+                       Assert.AreEqual ("miss5", dtLoad.Rows[1][2], "RowData1-2");
+                       Assert.AreEqual (6, dtLoad.Rows[2][0], "RowData2-0");
+                       Assert.AreEqual ("mono 6", dtLoad.Rows[2][1], "RowData2-1");
+                       Assert.AreEqual ("miss6", dtLoad.Rows[2][2], "RowData2-2");
+                       Assert.AreEqual (1, dtLoad.Rows[3][0], "RowData3-0");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[3][1], "RowData3-1");
+                       //Assert.IsNull (dtLoad.Rows[3][2], "RowData3-2");
+                       Assert.AreEqual (2, dtLoad.Rows[4][0], "RowData4-0");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[4][1], "RowData4-1");
+                       //Assert.IsNull (dtLoad.Rows[4][2], "RowData4-2");
+                       Assert.AreEqual (3, dtLoad.Rows[5][0], "RowData5-0");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[5][1], "RowData5-1");
+                       //Assert.IsNull (dtLoad.Rows[5][2], "RowData5-2");
+               }
+
+               private DataTable setupRowState ()
+               {
                        DataTable tbl = new DataTable ("LoadRowStateChanges");
                        tbl.RowChanged += new DataRowChangeEventHandler (dtLoad_RowChanged);
                        tbl.RowChanging += new DataRowChangeEventHandler (dtLoad_RowChanging);
@@ -2306,35 +2423,41 @@ namespace MonoTests.System.Data
                }
 
                private DataRowAction[] rowChangeAction = new DataRowAction[5];
-               private bool checkAction = false;
+               private bool checkAction;
                private int rowChagedCounter, rowChangingCounter;
-               private void rowActionInit (DataRowAction[] act) {
+               private void rowActionInit (DataRowAction[] act)
+               {
                        checkAction = true;
                        rowChagedCounter = 0;
                        rowChangingCounter = 0;
                        for (int i = 0; i < 5; i++)
                                rowChangeAction[i] = act[i];
                }
-               private void rowActionEnd () {
+
+               private void rowActionEnd ()
+               {
                        checkAction = false;
                }
-               private void dtLoad_RowChanged (object sender, DataRowChangeEventArgs e) {
+
+               private void dtLoad_RowChanged (object sender, DataRowChangeEventArgs e)
+               {
                        if (checkAction) {
-                               AssertEquals ("RowChanged" + rowChagedCounter,
-                                       rowChangeAction[rowChagedCounter], e.Action);
+                               Assert.AreEqual (rowChangeAction[rowChagedCounter], e.Action, "RowChanged" + rowChagedCounter);
                                rowChagedCounter++;
                        }
                }
-               private void dtLoad_RowChanging (object sender, DataRowChangeEventArgs e) {
+
+               private void dtLoad_RowChanging (object sender, DataRowChangeEventArgs e)
+               {
                        if (checkAction) {
-                               AssertEquals ("RowChanging" + rowChangingCounter,
-                                       rowChangeAction[rowChangingCounter], e.Action);
+                               Assert.AreEqual (rowChangeAction[rowChangingCounter], e.Action, "RowChanging" + rowChangingCounter);
                                rowChangingCounter++;
                        }
                }
 
                [Test]
-               public void Load_RowStateChangesDefault () {
+               public void Load_RowStateChangesDefault ()
+               {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
                        dt.Rows.Add (new object[] { 5, "mono 5" });
@@ -2351,43 +2474,29 @@ namespace MonoTests.System.Data
                        dtLoad.Load (dtr);
                        rowActionEnd ();
                        // asserting Unchanged Row0
-                       AssertEquals ("RowData0-C", "mono 1",
-                               dtLoad.Rows[0][1,DataRowVersion.Current]);
-                       AssertEquals ("RowData0-O", "mono 1",
-                               dtLoad.Rows[0][1,DataRowVersion.Original]);
-                       AssertEquals ("RowState0", DataRowState.Unchanged,
-                               dtLoad.Rows[0].RowState);
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1,DataRowVersion.Current], "RowData0-C");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1,DataRowVersion.Original], "RowData0-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[0].RowState, "RowState0");
                        // asserting Modified Row1
-                       AssertEquals ("RowData1-C", "Modify 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData1-O", "mono 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState1", DataRowState.Modified,
-                               dtLoad.Rows[1].RowState);
+                       Assert.AreEqual ("Modify 2", dtLoad.Rows[1][1, DataRowVersion.Current], "RowData1-C");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1, DataRowVersion.Original], "RowData1-O");
+                       Assert.AreEqual (DataRowState.Modified, dtLoad.Rows[1].RowState, "RowState1");
                        // asserting Deleted Row2
-                       AssertEquals ("RowData1-O", "mono 3",
-                               dtLoad.Rows[2][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState2", DataRowState.Deleted,
-                               dtLoad.Rows[2].RowState);
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[2][1, DataRowVersion.Original], "RowData1-O");
+                       Assert.AreEqual (DataRowState.Deleted, dtLoad.Rows[2].RowState, "RowState2");
                        // asserting Added Row3
-                       AssertEquals ("RowData3-C", "Add 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData3-O", "mono 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState3", DataRowState.Modified,
-                               dtLoad.Rows[3].RowState);
+                       Assert.AreEqual ("Add 4", dtLoad.Rows[3][1, DataRowVersion.Current], "RowData3-C");
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[3][1, DataRowVersion.Original], "RowData3-O");
+                       Assert.AreEqual (DataRowState.Modified, dtLoad.Rows[3].RowState, "RowState3");
                        // asserting Unpresent Row4
-                       AssertEquals ("RowData4-C", "mono 5",
-                               dtLoad.Rows[4][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData4-O", "mono 5",
-                               dtLoad.Rows[4][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState4", DataRowState.Unchanged,
-                               dtLoad.Rows[4].RowState);
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[4][1, DataRowVersion.Current], "RowData4-C");
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[4][1, DataRowVersion.Original], "RowData4-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[4].RowState, "RowState4");
                }
 
                [Test]
-               [ExpectedException (typeof (VersionNotFoundException))]
-               public void Load_RowStateChangesDefaultDelete () {
+               public void Load_RowStateChangesDefaultDelete ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2400,12 +2509,17 @@ namespace MonoTests.System.Data
                        dtLoad.Rows[2].Delete ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr);
-                       AssertEquals ("RowData2-C", " ",
-                               dtLoad.Rows[2][1, DataRowVersion.Current]);
+
+                       try {
+                               Assert.AreEqual (" ", dtLoad.Rows[2][1, DataRowVersion.Current], "RowData2-C");
+                               Assert.Fail ("#1");
+                       } catch (VersionNotFoundException) {
+                       }
                }
 
                [Test]
-               public void Load_RowStatePreserveChanges () {
+               public void Load_RowStatePreserveChanges ()
+               {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
                        dt.Rows.Add (new object[] { 5, "mono 5" });
@@ -2422,42 +2536,27 @@ namespace MonoTests.System.Data
                        dtLoad.Load (dtr, LoadOption.PreserveChanges);
                        rowActionEnd ();
                        // asserting Unchanged Row0
-                       AssertEquals ("RowData0-C", "mono 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData0-O", "mono 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState0", DataRowState.Unchanged,
-                               dtLoad.Rows[0].RowState);
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1, DataRowVersion.Current], "RowData0-C");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1, DataRowVersion.Original], "RowData0-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[0].RowState, "RowState0");
                        // asserting Modified Row1
-                       AssertEquals ("RowData1-C", "Modify 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData1-O", "mono 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState1", DataRowState.Modified,
-                               dtLoad.Rows[1].RowState);
+                       Assert.AreEqual ("Modify 2", dtLoad.Rows[1][1, DataRowVersion.Current], "RowData1-C");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1, DataRowVersion.Original], "RowData1-O");
+                       Assert.AreEqual (DataRowState.Modified, dtLoad.Rows[1].RowState, "RowState1");
                        // asserting Deleted Row2
-                       AssertEquals ("RowData1-O", "mono 3",
-                               dtLoad.Rows[2][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState2", DataRowState.Deleted,
-                               dtLoad.Rows[2].RowState);
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[2][1, DataRowVersion.Original], "RowData1-O");
+                       Assert.AreEqual (DataRowState.Deleted, dtLoad.Rows[2].RowState, "RowState2");
                        // asserting Added Row3
-                       AssertEquals ("RowData3-C", "Add 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData3-O", "mono 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState3", DataRowState.Modified,
-                               dtLoad.Rows[3].RowState);
+                       Assert.AreEqual ("Add 4", dtLoad.Rows[3][1, DataRowVersion.Current], "RowData3-C");
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[3][1, DataRowVersion.Original], "RowData3-O");
+                       Assert.AreEqual (DataRowState.Modified, dtLoad.Rows[3].RowState, "RowState3");
                        // asserting Unpresent Row4
-                       AssertEquals ("RowData4-C", "mono 5",
-                               dtLoad.Rows[4][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData4-O", "mono 5",
-                               dtLoad.Rows[4][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState4", DataRowState.Unchanged,
-                               dtLoad.Rows[4].RowState);
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[4][1, DataRowVersion.Current], "RowData4-C");
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[4][1, DataRowVersion.Original], "RowData4-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[4].RowState, "RowState4");
                }
 
                [Test]
-               [ExpectedException (typeof (VersionNotFoundException))]
                public void Load_RowStatePreserveChangesDelete () {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
@@ -2471,12 +2570,17 @@ namespace MonoTests.System.Data
                        dtLoad.Rows[2].Delete ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr,LoadOption.PreserveChanges);
-                       AssertEquals ("RowData2-C", " ",
-                               dtLoad.Rows[2][1, DataRowVersion.Current]);
+
+                       try {
+                               Assert.AreEqual (" ", dtLoad.Rows[2][1, DataRowVersion.Current], "RowData2-C");
+                               Assert.Fail ("#1");
+                       } catch (VersionNotFoundException) {
+                       }
                }
 
                [Test]
-               public void Load_RowStateOverwriteChanges () {
+               public void Load_RowStateOverwriteChanges ()
+               {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
                        dt.Rows.Add (new object[] { 5, "mono 5" });
@@ -2493,44 +2597,30 @@ namespace MonoTests.System.Data
                        dtLoad.Load (dtr, LoadOption.OverwriteChanges);
                        rowActionEnd ();
                        // asserting Unchanged Row0
-                       AssertEquals ("RowData0-C", "mono 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData0-O", "mono 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState0", DataRowState.Unchanged,
-                               dtLoad.Rows[0].RowState);
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1, DataRowVersion.Current], "RowData0-C");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1, DataRowVersion.Original], "RowData0-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[0].RowState, "RowState0");
                        // asserting Modified Row1
-                       AssertEquals ("RowData1-C", "mono 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData1-O", "mono 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState1", DataRowState.Unchanged,
-                               dtLoad.Rows[1].RowState);
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1, DataRowVersion.Current], "RowData1-C");
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1, DataRowVersion.Original], "RowData1-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[1].RowState, "RowState1");
                        // asserting Deleted Row2
-                       AssertEquals ("RowData1-C", "mono 3",
-                               dtLoad.Rows[2][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData1-O", "mono 3",
-                               dtLoad.Rows[2][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState2", DataRowState.Unchanged,
-                               dtLoad.Rows[2].RowState);
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[2][1, DataRowVersion.Current], "RowData1-C");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[2][1, DataRowVersion.Original], "RowData1-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[2].RowState, "RowState2");
                        // asserting Added Row3
-                       AssertEquals ("RowData3-C", "mono 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData3-O", "mono 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState3", DataRowState.Unchanged,
-                               dtLoad.Rows[3].RowState);
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[3][1, DataRowVersion.Current], "RowData3-C");
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[3][1, DataRowVersion.Original], "RowData3-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[3].RowState, "RowState3");
                        // asserting Unpresent Row4
-                       AssertEquals ("RowData4-C", "mono 5",
-                               dtLoad.Rows[4][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData4-O", "mono 5",
-                               dtLoad.Rows[4][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState4", DataRowState.Unchanged,
-                               dtLoad.Rows[4].RowState);
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[4][1, DataRowVersion.Current], "RowData4-C");
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[4][1, DataRowVersion.Original], "RowData4-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[4].RowState, "RowState4");
                }
 
                [Test]
-               public void Load_RowStateUpsert () {
+               public void Load_RowStateUpsert ()
+               {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
                        dt.Rows.Add (new object[] { 5, "mono 5" });
@@ -2549,44 +2639,31 @@ namespace MonoTests.System.Data
                        dtLoad.Load (dtr, LoadOption.Upsert);
                        rowActionEnd ();
                        // asserting Unchanged Row0
-                       AssertEquals ("RowData0-C", "mono 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData0-O", "RowState 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState0", DataRowState.Modified,
-                               dtLoad.Rows[0].RowState);
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1, DataRowVersion.Current], "RowData0-C");
+                       Assert.AreEqual ("RowState 1", dtLoad.Rows[0][1, DataRowVersion.Original], "RowData0-O");
+                       Assert.AreEqual (DataRowState.Modified, dtLoad.Rows[0].RowState, "RowState0");
                        // asserting Modified Row1
-                       AssertEquals ("RowData1-C", "mono 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData1-O", "RowState 2",
-                               dtLoad.Rows[1][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState1", DataRowState.Modified,
-                               dtLoad.Rows[1].RowState);
+                       Assert.AreEqual ("mono 2", dtLoad.Rows[1][1, DataRowVersion.Current], "RowData1-C");
+                       Assert.AreEqual ("RowState 2", dtLoad.Rows[1][1, DataRowVersion.Original], "RowData1-O");
+                       Assert.AreEqual (DataRowState.Modified, dtLoad.Rows[1].RowState, "RowState1");
                        // asserting Deleted Row2 and "Deleted-Added" Row4
-                       AssertEquals ("RowData2-O", "RowState 3",
-                               dtLoad.Rows[2][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState2", DataRowState.Deleted,
-                               dtLoad.Rows[2].RowState);
-                       AssertEquals ("RowData4-C", "mono 3",
-                               dtLoad.Rows[4][1, DataRowVersion.Current]);
-                       AssertEquals ("RowState4", DataRowState.Added,
-                               dtLoad.Rows[4].RowState);
+                       Assert.AreEqual ("RowState 3", dtLoad.Rows[2][1, DataRowVersion.Original], "RowData2-O");
+                       Assert.AreEqual (DataRowState.Deleted, dtLoad.Rows[2].RowState, "RowState2");
+                       Assert.AreEqual ("mono 3", dtLoad.Rows[4][1, DataRowVersion.Current], "RowData4-C");
+                       Assert.AreEqual (DataRowState.Added, dtLoad.Rows[4].RowState, "RowState4");
                        // asserting Added Row3
-                       AssertEquals ("RowData3-C", "mono 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Current]);
-                       AssertEquals ("RowState3", DataRowState.Added,
-                               dtLoad.Rows[3].RowState);
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[3][1, DataRowVersion.Current], "RowData3-C");
+                       Assert.AreEqual (DataRowState.Added, dtLoad.Rows[3].RowState, "RowState3");
                        // asserting Unpresent Row5
                        // Notice row4 is used for added row of deleted row2 and so
                        // unpresent row4 moves to row5
-                       AssertEquals ("RowData5-C", "mono 5",
-                               dtLoad.Rows[5][1, DataRowVersion.Current]);
-                       AssertEquals ("RowState5", DataRowState.Added,
-                               dtLoad.Rows[5].RowState);
+                       Assert.AreEqual ("mono 5", dtLoad.Rows[5][1, DataRowVersion.Current], "RowData5-C");
+                       Assert.AreEqual (DataRowState.Added, dtLoad.Rows[5].RowState, "RowState5");
                }
 
                [Test]
-               public void Load_RowStateUpsertDuplicateKey1 () {
+               public void Load_RowStateUpsertDuplicateKey1 ()
+               {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
@@ -2601,44 +2678,29 @@ namespace MonoTests.System.Data
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr, LoadOption.Upsert);
                        dtLoad.Rows[3][1] = "NEWVAL";
-                       AssertEquals ("A-RowState2", DataRowState.Deleted,
-                               dtLoad.Rows[2].RowState);
-                       AssertEquals ("A-RowData2-id", 3,
-                               dtLoad.Rows[2][0, DataRowVersion.Original]);
-                       AssertEquals ("A-RowData2-name", "RowState 3",
-                               dtLoad.Rows[2][1, DataRowVersion.Original]);
-                       AssertEquals ("A-RowState3", DataRowState.Added,
-                               dtLoad.Rows[3].RowState);
-                       AssertEquals ("A-RowData3-id", 3,
-                               dtLoad.Rows[3][0, DataRowVersion.Current]);
-                       AssertEquals ("A-RowData3-name", "NEWVAL",
-                               dtLoad.Rows[3][1, DataRowVersion.Current]);
-                       AssertEquals ("A-RowState4", DataRowState.Added,
-                               dtLoad.Rows[4].RowState);
-                       AssertEquals ("A-RowData4-id", 4,
-                               dtLoad.Rows[4][0, DataRowVersion.Current]);
-                       AssertEquals ("A-RowData4-name", "mono 4",
-                               dtLoad.Rows[4][1, DataRowVersion.Current]);
+                       Assert.AreEqual (DataRowState.Deleted, dtLoad.Rows[2].RowState, "A-RowState2");
+                       Assert.AreEqual (3, dtLoad.Rows[2][0, DataRowVersion.Original], "A-RowData2-id");
+                       Assert.AreEqual ("RowState 3", dtLoad.Rows[2][1, DataRowVersion.Original], "A-RowData2-name");
+                       Assert.AreEqual (DataRowState.Added, dtLoad.Rows[3].RowState, "A-RowState3");
+                       Assert.AreEqual (3, dtLoad.Rows[3][0, DataRowVersion.Current], "A-RowData3-id");
+                       Assert.AreEqual ("NEWVAL", dtLoad.Rows[3][1, DataRowVersion.Current], "A-RowData3-name");
+                       Assert.AreEqual (DataRowState.Added, dtLoad.Rows[4].RowState, "A-RowState4");
+                       Assert.AreEqual (4, dtLoad.Rows[4][0, DataRowVersion.Current], "A-RowData4-id");
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[4][1, DataRowVersion.Current], "A-RowData4-name");
 
                        dtLoad.AcceptChanges ();
 
-                       AssertEquals ("B-RowState2", DataRowState.Unchanged,
-                               dtLoad.Rows[2].RowState);
-                       AssertEquals ("B-RowData2-id", 3,
-                               dtLoad.Rows[2][0, DataRowVersion.Current]);
-                       AssertEquals ("B-RowData2-name", "NEWVAL",
-                               dtLoad.Rows[2][1, DataRowVersion.Current]);
-                       AssertEquals ("B-RowState3", DataRowState.Unchanged,
-                               dtLoad.Rows[3].RowState);
-                       AssertEquals ("B-RowData3-id", 4,
-                               dtLoad.Rows[3][0, DataRowVersion.Current]);
-                       AssertEquals ("B-RowData3-name", "mono 4",
-                               dtLoad.Rows[3][1, DataRowVersion.Current]);
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[2].RowState, "B-RowState2");
+                       Assert.AreEqual (3, dtLoad.Rows[2][0, DataRowVersion.Current], "B-RowData2-id");
+                       Assert.AreEqual ("NEWVAL", dtLoad.Rows[2][1, DataRowVersion.Current], "B-RowData2-name");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[3].RowState, "B-RowState3");
+                       Assert.AreEqual (4, dtLoad.Rows[3][0, DataRowVersion.Current], "B-RowData3-id");
+                       Assert.AreEqual ("mono 4", dtLoad.Rows[3][1, DataRowVersion.Current], "B-RowData3-name");
                }
 
                [Test]
-               [ExpectedException (typeof (IndexOutOfRangeException))]
-               public void Load_RowStateUpsertDuplicateKey2 () {
+               public void Load_RowStateUpsertDuplicateKey2 ()
+               {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
@@ -2653,12 +2715,17 @@ namespace MonoTests.System.Data
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr, LoadOption.Upsert);
                        dtLoad.AcceptChanges ();
-                       AssertEquals ("RowData4", " ", dtLoad.Rows[4][1]);
+
+                       try {
+                               Assert.AreEqual (" ", dtLoad.Rows[4][1], "RowData4");
+                               Assert.Fail ("#1");
+                       } catch (IndexOutOfRangeException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (VersionNotFoundException))]
-               public void Load_RowStateUpsertDelete1 () {
+               public void Load_RowStateUpsertDelete1 ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2671,13 +2738,17 @@ namespace MonoTests.System.Data
                        dtLoad.Rows[2].Delete ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr, LoadOption.Upsert);
-                       AssertEquals ("RowData2-C", " ",
-                               dtLoad.Rows[2][1, DataRowVersion.Current]);
+
+                       try {
+                               Assert.AreEqual (" ", dtLoad.Rows[2][1, DataRowVersion.Current], "RowData2-C");
+                               Assert.Fail ("#1");
+                       } catch (VersionNotFoundException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (VersionNotFoundException))]
-               public void Load_RowStateUpsertDelete2 () {
+               public void Load_RowStateUpsertDelete2 ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2690,13 +2761,17 @@ namespace MonoTests.System.Data
                        dtLoad.Rows[2].Delete ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr, LoadOption.Upsert);
-                       AssertEquals ("RowData3-O", " ",
-                               dtLoad.Rows[3][1, DataRowVersion.Original]);
+
+                       try {
+                               Assert.AreEqual (" ", dtLoad.Rows[3][1, DataRowVersion.Original], "RowData3-O");
+                               Assert.Fail ("#1");
+                       } catch (VersionNotFoundException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (VersionNotFoundException))]
-               public void Load_RowStateUpsertAdd () {
+               public void Load_RowStateUpsertAdd ()
+               {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
@@ -2713,12 +2788,15 @@ namespace MonoTests.System.Data
                        dtLoad.Rows.Add (row);
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr, LoadOption.Upsert);
-                       AssertEquals ("RowData3-O", " ",
-                               dtLoad.Rows[3][1, DataRowVersion.Original]);
+
+                       try {
+                               Assert.AreEqual (" ", dtLoad.Rows[3][1, DataRowVersion.Original], "RowData3-O");
+                               Assert.Fail ("#1");
+                       } catch (VersionNotFoundException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (VersionNotFoundException))]
                public void Load_RowStateUpsertUnpresent () {
                        localSetup ();
                        dt.Rows.Add (new object[] { 4, "mono 4" });
@@ -2732,12 +2810,17 @@ namespace MonoTests.System.Data
                        dtLoad.AcceptChanges ();
                        DataTableReader dtr = dt.CreateDataReader ();
                        dtLoad.Load (dtr, LoadOption.Upsert);
-                       AssertEquals ("RowData3-O", " ",
-                               dtLoad.Rows[3][1, DataRowVersion.Original]);
+
+                       try {
+                               Assert.AreEqual (" ", dtLoad.Rows[3][1, DataRowVersion.Original], "RowData3-O");
+                               Assert.Fail ("#1");
+                       } catch (VersionNotFoundException) {
+                       }
                }
 
                [Test]
-               public void Load_RowStateUpsertUnchangedEqualVal () {
+               public void Load_RowStateUpsertUnchangedEqualVal ()
+               {
                        localSetup ();
                        DataTable dtLoad = new DataTable ("LoadRowStateChanges");
                        dtLoad.Columns.Add ("id", typeof (int));
@@ -2755,16 +2838,14 @@ namespace MonoTests.System.Data
                        rowActionInit (dra);
                        dtLoad.Load (dtr, LoadOption.Upsert);
                        rowActionEnd ();
-                       AssertEquals ("RowData0-C", "mono 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Current]);
-                       AssertEquals ("RowData0-O", "mono 1",
-                               dtLoad.Rows[0][1, DataRowVersion.Original]);
-                       AssertEquals ("RowState0", DataRowState.Unchanged,
-                               dtLoad.Rows[0].RowState);
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1, DataRowVersion.Current], "RowData0-C");
+                       Assert.AreEqual ("mono 1", dtLoad.Rows[0][1, DataRowVersion.Original], "RowData0-O");
+                       Assert.AreEqual (DataRowState.Unchanged, dtLoad.Rows[0].RowState, "RowState0");
                }
 
                [Test]
-               public void LoadDataRow_LoadOptions () {
+               public void LoadDataRow_LoadOptions ()
+               {
                        // LoadDataRow is covered in detail (without LoadOptions) in DataTableTest2
                        // LoadOption tests are covered in detail in DataTable.Load().
                        // Therefore only minimal tests of LoadDataRow with LoadOptions are covered here.
@@ -2783,13 +2864,11 @@ namespace MonoTests.System.Data
                        dt.EndLoadData ();
 
                        // LoadDataRow(update1) - check column String2
-                       AssertEquals ("DT72-C", "Changed",
-                               dr["String2", DataRowVersion.Current]);
-                       AssertEquals ("DT72-O", "Changed",
-                               dr["String2", DataRowVersion.Original]);
+                       Assert.AreEqual ("Changed", dr["String2", DataRowVersion.Current], "DT72-C");
+                       Assert.AreEqual ("Changed", dr["String2", DataRowVersion.Original], "DT72-O");
 
                        // LoadDataRow(update1) - check row state
-                       AssertEquals ("DT73-LO", DataRowState.Unchanged, dr.RowState);
+                       Assert.AreEqual (DataRowState.Unchanged, dr.RowState, "DT73-LO");
 
                        //Add New row with LoadOptions = Upsert
                        dt.BeginLoadData ();
@@ -2799,14 +2878,14 @@ namespace MonoTests.System.Data
 
                        // LoadDataRow(insert1) - check column String2
                        dr = dt.Select ("ParentId=99")[0];
-                       AssertEquals ("DT75-C", "Changed",
-                               dr["String2", DataRowVersion.Current]);
+                       Assert.AreEqual ("Changed", dr["String2", DataRowVersion.Current], "DT75-C");
 
                        // LoadDataRow(insert1) - check row state
-                       AssertEquals ("DT76-LO", DataRowState.Added, dr.RowState);
+                       Assert.AreEqual (DataRowState.Added, dr.RowState, "DT76-LO");
                }
 
-               public static DataTable CreateDataTableExample () {
+               public static DataTable CreateDataTableExample ()
+               {
                        DataTable dtParent = new DataTable ("Parent");
 
                        dtParent.Columns.Add ("ParentId", typeof (int));
@@ -2832,94 +2911,96 @@ namespace MonoTests.System.Data
                #region Read/Write XML Tests
 
                [Test]
-               //[Category ("NotWorking")]
-               public void ReadXmlSchema () {
+               public void ReadXmlSchema ()
+               {
                        DataTable Table = new DataTable ();
                        Table.ReadXmlSchema ("Test/System.Data/own_schema1.xsd");
 
-                       AssertEquals ("test#02", "test_table", Table.TableName);
-                       AssertEquals ("test#03", "", Table.Namespace);
-                       AssertEquals ("test#04", 2, Table.Columns.Count);
-                       AssertEquals ("test#05", 0, Table.Rows.Count);
-                       AssertEquals ("test#06", false, Table.CaseSensitive);
-                       AssertEquals ("test#07", 1, Table.Constraints.Count);
-                       AssertEquals ("test#08", "", Table.Prefix);
+                       Assert.AreEqual ("test_table", Table.TableName, "test#02");
+                       Assert.AreEqual ("", Table.Namespace, "test#03");
+                       Assert.AreEqual (2, Table.Columns.Count, "test#04");
+                       Assert.AreEqual (0, Table.Rows.Count, "test#05");
+                       Assert.IsFalse (Table.CaseSensitive, "test#06");
+                       Assert.AreEqual (1, Table.Constraints.Count, "test#07");
+                       Assert.AreEqual ("", Table.Prefix, "test#08");
 
                        Constraint cons = Table.Constraints[0];
-                       AssertEquals ("test#09", "Constraint1", cons.ConstraintName.ToString ());
-                       AssertEquals ("test#10", "Constraint1", cons.ToString ());
+                       Assert.AreEqual ("Constraint1", cons.ConstraintName.ToString (), "test#09");
+                       Assert.AreEqual ("Constraint1", cons.ToString (), "test#10");
 
                        DataColumn column = Table.Columns[0];
-                       AssertEquals ("test#11", true, column.AllowDBNull);
-                       AssertEquals ("test#12", false, column.AutoIncrement);
-                       AssertEquals ("test#13", 0L, column.AutoIncrementSeed);
-                       AssertEquals ("test#14", 1L, column.AutoIncrementStep);
-                       AssertEquals ("test#15", "test", column.Caption);
-                       AssertEquals ("test#16", "Element", column.ColumnMapping.ToString ());
-                       AssertEquals ("test#17", "first", column.ColumnName);
-                       AssertEquals ("test#18", "System.String", column.DataType.ToString ());
-                       AssertEquals ("test#19", "test_default_value", column.DefaultValue.ToString ());
-                       AssertEquals ("test#20", false, column.DesignMode);
-                       AssertEquals ("test#21", "", column.Expression);
-                       AssertEquals ("test#22", 100, column.MaxLength);
-                       AssertEquals ("test#23", "", column.Namespace);
-                       AssertEquals ("test#24", 0, column.Ordinal);
-                       AssertEquals ("test#25", "", column.Prefix);
-                       AssertEquals ("test#26", false, column.ReadOnly);
-                       AssertEquals ("test#27", true, column.Unique);
+                       Assert.IsTrue (column.AllowDBNull, "test#11");
+                       Assert.IsFalse (column.AutoIncrement, "test#12");
+                       Assert.AreEqual (0L, column.AutoIncrementSeed, "test#13");
+                       Assert.AreEqual (1L, column.AutoIncrementStep, "test#14");
+                       Assert.AreEqual ("test", column.Caption, "test#15");
+                       Assert.AreEqual ("Element", column.ColumnMapping.ToString (), "test#16");
+                       Assert.AreEqual ("first", column.ColumnName, "test#17");
+                       Assert.AreEqual (typeof (string), column.DataType, "test#18");
+                       Assert.AreEqual ("test_default_value", column.DefaultValue.ToString (), "test#19");
+                       Assert.IsFalse (column.DesignMode, "test#20");
+                       Assert.AreEqual ("", column.Expression, "test#21");
+                       Assert.AreEqual (100, column.MaxLength, "test#22");
+                       Assert.AreEqual ("", column.Namespace, "test#23");
+                       Assert.AreEqual (0, column.Ordinal, "test#24");
+                       Assert.AreEqual ("", column.Prefix, "test#25");
+                       Assert.IsFalse (column.ReadOnly, "test#26");
+                       Assert.IsTrue (column.Unique, "test#27");
 
                        DataColumn column2 = Table.Columns[1];
-                       AssertEquals ("test#28", true, column2.AllowDBNull);
-                       AssertEquals ("test#29", false, column2.AutoIncrement);
-                       AssertEquals ("test#30", 0L, column2.AutoIncrementSeed);
-                       AssertEquals ("test#31", 1L, column2.AutoIncrementStep);
-                       AssertEquals ("test#32", "second", column2.Caption);
-                       AssertEquals ("test#33", "Element", column2.ColumnMapping.ToString ());
-                       AssertEquals ("test#34", "second", column2.ColumnName);
-                       AssertEquals ("test#35", "System.Data.SqlTypes.SqlGuid", column2.DataType.ToString ());
-                       AssertEquals ("test#36", "Null", column2.DefaultValue.ToString ());
-                       AssertEquals ("test#37", false, column2.DesignMode);
-                       AssertEquals ("test#38", "", column2.Expression);
-                       AssertEquals ("test#39", -1, column2.MaxLength);
-                       AssertEquals ("test#40", "", column2.Namespace);
-                       AssertEquals ("test#41", 1, column2.Ordinal);
-                       AssertEquals ("test#42", "", column2.Prefix);
-                       AssertEquals ("test#43", false, column2.ReadOnly);
-                       AssertEquals ("test#44", false, column2.Unique);
+                       Assert.IsTrue (column2.AllowDBNull, "test#28");
+                       Assert.IsFalse (column2.AutoIncrement, "test#29");
+                       Assert.AreEqual (0L, column2.AutoIncrementSeed, "test#30");
+                       Assert.AreEqual (1L, column2.AutoIncrementStep, "test#31");
+                       Assert.AreEqual ("second", column2.Caption, "test#32");
+                       Assert.AreEqual ("Element", column2.ColumnMapping.ToString (), "test#33");
+                       Assert.AreEqual ("second", column2.ColumnName, "test#34");
+                       Assert.AreEqual (typeof (SqlGuid), column2.DataType, "test#35");
+                       Assert.AreEqual (SqlGuid.Null, column2.DefaultValue, "test#36");
+                       Assert.AreEqual (typeof (SqlGuid), column2.DefaultValue.GetType (), "test#36-2");
+                       Assert.IsFalse (column2.DesignMode, "test#37");
+                       Assert.AreEqual ("", column2.Expression, "test#38");
+                       Assert.AreEqual (-1, column2.MaxLength, "test#39");
+                       Assert.AreEqual ("", column2.Namespace, "test#40");
+                       Assert.AreEqual (1, column2.Ordinal, "test#41");
+                       Assert.AreEqual ("", column2.Prefix, "test#42");
+                       Assert.IsFalse (column2.ReadOnly, "test#43");
+                       Assert.IsFalse (column2.Unique, "test#44");
 
                        DataTable Table2 = new DataTable ();
                        Table2.ReadXmlSchema ("Test/System.Data/own_schema2.xsd");
 
-                       AssertEquals ("test#45", "second_test_table", Table2.TableName);
-                       AssertEquals ("test#46", "", Table2.Namespace);
-                       AssertEquals ("test#47", 1, Table2.Columns.Count);
-                       AssertEquals ("test#48", 0, Table2.Rows.Count);
-                       AssertEquals ("test#49", false, Table2.CaseSensitive);
-                       AssertEquals ("test#50", 1, Table2.Constraints.Count);
-                       AssertEquals ("test#51", "", Table2.Prefix);
+                       Assert.AreEqual ("second_test_table", Table2.TableName, "test#45");
+                       Assert.AreEqual ("", Table2.Namespace, "test#46");
+                       Assert.AreEqual (1, Table2.Columns.Count, "test#47");
+                       Assert.AreEqual (0, Table2.Rows.Count, "test#48");
+                       Assert.IsFalse (Table2.CaseSensitive, "test#49");
+                       Assert.AreEqual (1, Table2.Constraints.Count, "test#50");
+                       Assert.AreEqual ("", Table2.Prefix, "test#51");
 
                        DataColumn column3 = Table2.Columns[0];
-                       AssertEquals ("test#52", true, column3.AllowDBNull);
-                       AssertEquals ("test#53", false, column3.AutoIncrement);
-                       AssertEquals ("test#54", 0L, column3.AutoIncrementSeed);
-                       AssertEquals ("test#55", 1L, column3.AutoIncrementStep);
-                       AssertEquals ("test#56", "second_first", column3.Caption);
-                       AssertEquals ("test#57", "Element", column3.ColumnMapping.ToString ());
-                       AssertEquals ("test#58", "second_first", column3.ColumnName);
-                       AssertEquals ("test#59", "System.String", column3.DataType.ToString ());
-                       AssertEquals ("test#60", "default_value", column3.DefaultValue.ToString ());
-                       AssertEquals ("test#61", false, column3.DesignMode);
-                       AssertEquals ("test#62", "", column3.Expression);
-                       AssertEquals ("test#63", 100, column3.MaxLength);
-                       AssertEquals ("test#64", "", column3.Namespace);
-                       AssertEquals ("test#65", 0, column3.Ordinal);
-                       AssertEquals ("test#66", "", column3.Prefix);
-                       AssertEquals ("test#67", false, column3.ReadOnly);
-                       AssertEquals ("test#68", true, column3.Unique);
-               }
-
-               [Test]
-               public void ReadXmlSchema_2 () {
+                       Assert.IsTrue (column3.AllowDBNull, "test#52");
+                       Assert.IsFalse (column3.AutoIncrement, "test#53");
+                       Assert.AreEqual (0L, column3.AutoIncrementSeed, "test#54");
+                       Assert.AreEqual (1L, column3.AutoIncrementStep, "test#55");
+                       Assert.AreEqual ("second_first", column3.Caption, "test#56");
+                       Assert.AreEqual ("Element", column3.ColumnMapping.ToString (), "test#57");
+                       Assert.AreEqual ("second_first", column3.ColumnName, "test#58");
+                       Assert.AreEqual (typeof (string), column3.DataType, "test#59");
+                       Assert.AreEqual ("default_value", column3.DefaultValue.ToString (), "test#60");
+                       Assert.IsFalse (column3.DesignMode, "test#61");
+                       Assert.AreEqual ("", column3.Expression, "test#62");
+                       Assert.AreEqual (100, column3.MaxLength, "test#63");
+                       Assert.AreEqual ("", column3.Namespace, "test#64");
+                       Assert.AreEqual (0, column3.Ordinal, "test#65");
+                       Assert.AreEqual ("", column3.Prefix, "test#66");
+                       Assert.IsFalse (column3.ReadOnly, "test#67");
+                       Assert.IsTrue (column3.Unique, "test#68");
+               }
+
+               [Test]
+               public void ReadXmlSchema_2 ()
+               {
                        DataTable dt = new DataTable ();
                        string xmlData = string.Empty;
                        xmlData += "<?xml version=\"1.0\"?>";
@@ -2955,7 +3036,8 @@ namespace MonoTests.System.Data
                }
 
                [Test]
-               public void ReadXmlSchema_ByStream () {
+               public void ReadXmlSchema_ByStream ()
+               {
                        DataSet ds1 = new DataSet ();
                        ds1.Tables.Add (DataProvider.CreateParentDataTable ());
                        ds1.Tables.Add (DataProvider.CreateChildDataTable ());
@@ -2983,31 +3065,31 @@ namespace MonoTests.System.Data
                        //Assert.AreEqual (ds2.Tables.Count, ds1.Tables.Count, "DS269");
 
                        // ReadXmlSchema - Tables 0 Col count
-                       AssertEquals ("DS270", ds1.Tables[0].Columns.Count, dt1.Columns.Count);
+                       Assert.AreEqual (ds1.Tables[0].Columns.Count, dt1.Columns.Count, "DS270");
 
                        // ReadXmlSchema - Tables 1 Col count
-                       AssertEquals ("DS271", ds1.Tables[1].Columns.Count, dt2.Columns.Count);
+                       Assert.AreEqual (ds1.Tables[1].Columns.Count, dt2.Columns.Count, "DS271");
 
                        //check some colummns types
                        // ReadXmlSchema - Tables 0 Col type
-                       AssertEquals ("DS272", ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType ());
+                       Assert.AreEqual (ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType (), "DS272");
 
                        // ReadXmlSchema - Tables 1 Col type
-                       AssertEquals ("DS273", ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType ());
+                       Assert.AreEqual (ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType (), "DS273");
 
                        //check that no data exists
                        // ReadXmlSchema - Table 1 row count
-                       AssertEquals ("DS274",0, dt1.Rows.Count);
+                       Assert.AreEqual (0, dt1.Rows.Count, "DS274");
 
                        // ReadXmlSchema - Table 2 row count
-                       AssertEquals ("DS275",0, dt2.Rows.Count);
+                       Assert.AreEqual (0, dt2.Rows.Count, "DS275");
                }
 
                [Test]
-               //[Category ("NotWorking")]
-               public void ReadWriteXmlSchema_ByFileName () {
-                       string sTempFileName1 = "tmpDataSet_ReadWriteXml_43899-1.xml";
-                       string sTempFileName2 = "tmpDataSet_ReadWriteXml_43899-2.xml";
+               public void ReadWriteXmlSchema_ByFileName ()
+               {
+                       string sTempFileName1 = Path.Combine (Path.GetTempPath (), "tmpDataSet_ReadWriteXml_43899-1.xml");
+                       string sTempFileName2 = Path.Combine (Path.GetTempPath (), "tmpDataSet_ReadWriteXml_43899-2.xml");
 
                        DataSet ds1 = new DataSet ();
                        ds1.Tables.Add (DataProvider.CreateParentDataTable ());
@@ -3022,19 +3104,20 @@ namespace MonoTests.System.Data
                        dt1.ReadXmlSchema (sTempFileName1);
                        dt2.ReadXmlSchema (sTempFileName2);
 
-                       AssertEquals ("DS277", ds1.Tables[0].Columns.Count, dt1.Columns.Count);
-                       AssertEquals ("DS278", ds1.Tables[1].Columns.Count, dt2.Columns.Count);
-                       AssertEquals ("DS279", ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType ());
-                       AssertEquals ("DS280", ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType ());
-                       AssertEquals ("DS281", 0, dt1.Rows.Count);
-                       AssertEquals ("DS282", 0, dt2.Rows.Count);
+                       Assert.AreEqual (ds1.Tables[0].Columns.Count, dt1.Columns.Count, "DS277");
+                       Assert.AreEqual (ds1.Tables[1].Columns.Count, dt2.Columns.Count, "DS278");
+                       Assert.AreEqual (ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType (), "DS279");
+                       Assert.AreEqual (ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType (), "DS280");
+                       Assert.AreEqual (0, dt1.Rows.Count, "DS281");
+                       Assert.AreEqual (0, dt2.Rows.Count, "DS282");
 
                        File.Delete (sTempFileName1);
                        File.Delete (sTempFileName2);
                }
 
                [Test]
-               public void ReadXmlSchema_ByTextReader () {
+               public void ReadXmlSchema_ByTextReader ()
+               {
                        DataSet ds1 = new DataSet ();
                        ds1.Tables.Add (DataProvider.CreateParentDataTable ());
                        ds1.Tables.Add (DataProvider.CreateChildDataTable ());
@@ -3062,28 +3145,29 @@ namespace MonoTests.System.Data
                        //Assert.AreEqual (ds2.Tables.Count, ds1.Tables.Count, "DS283");
 
                        // ReadXmlSchema - Tables 0 Col count
-                       AssertEquals ("DS284", ds1.Tables[0].Columns.Count, dt1.Columns.Count);
+                       Assert.AreEqual (ds1.Tables[0].Columns.Count, dt1.Columns.Count, "DS284");
 
                        // ReadXmlSchema - Tables 1 Col count
-                       AssertEquals ("DS285", ds1.Tables[1].Columns.Count, dt2.Columns.Count);
+                       Assert.AreEqual (ds1.Tables[1].Columns.Count, dt2.Columns.Count, "DS285");
 
                        //check some colummns types
                        // ReadXmlSchema - Tables 0 Col type
-                       AssertEquals ("DS286", ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType ());
+                       Assert.AreEqual (ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType (), "DS286");
 
                        // ReadXmlSchema - Tables 1 Col type
-                       AssertEquals ("DS287", ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType ());
+                       Assert.AreEqual (ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType (), "DS287");
 
                        //check that no data exists
                        // ReadXmlSchema - Table 1 row count
-                       AssertEquals ("DS288", 0, dt1.Rows.Count);
+                       Assert.AreEqual (0, dt1.Rows.Count, "DS288");
 
                        // ReadXmlSchema - Table 2 row count
-                       AssertEquals ("DS289", 0, dt2.Rows.Count);
+                       Assert.AreEqual (0, dt2.Rows.Count, "DS289");
                }
 
                [Test]
-               public void ReadXmlSchema_ByXmlReader () {
+               public void ReadXmlSchema_ByXmlReader ()
+               {
                        DataSet ds1 = new DataSet ();
                        ds1.Tables.Add (DataProvider.CreateParentDataTable ());
                        ds1.Tables.Add (DataProvider.CreateChildDataTable ());
@@ -3118,106 +3202,108 @@ namespace MonoTests.System.Data
                        //Assert.AreEqual (ds2.Tables.Count, ds1.Tables.Count, "DS290");
 
                        // ReadXmlSchema - Tables 0 Col count
-                       AssertEquals ("DS291", ds1.Tables[0].Columns.Count, dt1.Columns.Count);
+                       Assert.AreEqual (ds1.Tables[0].Columns.Count, dt1.Columns.Count, "DS291");
 
                        // ReadXmlSchema - Tables 1 Col count
-                       AssertEquals ("DS292", ds1.Tables[1].Columns.Count, dt2.Columns.Count);
+                       Assert.AreEqual (ds1.Tables[1].Columns.Count, dt2.Columns.Count, "DS292");
 
                        //check some colummns types
                        // ReadXmlSchema - Tables 0 Col type
-                       AssertEquals ("DS293", ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType ());
+                       Assert.AreEqual (ds1.Tables[0].Columns[0].GetType (), dt1.Columns[0].GetType (), "DS293");
 
                        // ReadXmlSchema - Tables 1 Col type
-                       AssertEquals ("DS294", ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType ());
+                       Assert.AreEqual (ds1.Tables[1].Columns[3].GetType (), dt2.Columns[3].GetType (), "DS294");
 
                        //check that no data exists
                        // ReadXmlSchema - Table 1 row count
-                       AssertEquals ("DS295", 0, dt1.Rows.Count);
+                       Assert.AreEqual (0, dt1.Rows.Count, "DS295");
 
                        // ReadXmlSchema - Table 2 row count
-                       AssertEquals ("DS296", 0, dt2.Rows.Count);
+                       Assert.AreEqual (0, dt2.Rows.Count, "DS296");
                }
 
                [Test]
-               public void WriteXmlSchema () {
+               public void WriteXmlSchema ()
+               {
                        DataSet ds = new DataSet ();
                        ds.ReadXml ("Test/System.Data/region.xml");
                        TextWriter writer = new StringWriter ();
                        ds.Tables[0].WriteXmlSchema (writer);
 
-
                        string TextString = GetNormalizedSchema (writer.ToString ());
                        //string TextString = writer.ToString ();
 
+                       EOL = "\n";
                        string substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#01", "<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring);
+                       Assert.AreEqual ("<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring, "test#01");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#02", "<xs:schema id=\"Root\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">", substring);
+                       Assert.AreEqual ("<xs:schema id=\"Root\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">", substring, "test#02");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#03", "  <xs:element msdata:IsDataSet=\"true\" msdata:MainDataTable=\"Region\" msdata:UseCurrentLocale=\"true\" name=\"Root\">", substring);
+                       Assert.AreEqual ("  <xs:element msdata:IsDataSet=\"true\" msdata:Locale=\"en-US\" msdata:MainDataTable=\"Region\" name=\"Root\">", substring, "test#03");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#04", "    <xs:complexType>", substring);
+                       Assert.AreEqual ("    <xs:complexType>", substring, "test#04");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#05", "      <xs:choice maxOccurs=\"unbounded\" minOccurs=\"0\">", substring);
+                       Assert.AreEqual ("      <xs:choice maxOccurs=\"unbounded\" minOccurs=\"0\">", substring, "test#05");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#06", "        <xs:element name=\"Region\">", substring);
+                       Assert.AreEqual ("        <xs:element name=\"Region\">", substring, "test#06");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#07", "          <xs:complexType>", substring);
+                       Assert.AreEqual ("          <xs:complexType>", substring, "test#07");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#08", "            <xs:sequence>", substring);
+                       Assert.AreEqual ("            <xs:sequence>", substring, "test#08");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#09", "              <xs:element minOccurs=\"0\" name=\"RegionID\" type=\"xs:string\" />", substring);
+                       Assert.AreEqual ("              <xs:element minOccurs=\"0\" name=\"RegionID\" type=\"xs:string\" />", substring, "test#09");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#10", "              <xs:element minOccurs=\"0\" name=\"RegionDescription\" type=\"xs:string\" />", substring);
+                       Assert.AreEqual ("              <xs:element minOccurs=\"0\" name=\"RegionDescription\" type=\"xs:string\" />", substring, "test#10");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#11", "            </xs:sequence>", substring);
+                       Assert.AreEqual ("            </xs:sequence>", substring, "test#11");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#12", "          </xs:complexType>", substring);
+                       Assert.AreEqual ("          </xs:complexType>", substring, "test#12");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#13", "        </xs:element>", substring);
+                       Assert.AreEqual ("        </xs:element>", substring, "test#13");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#14", "      </xs:choice>", substring);
+                       Assert.AreEqual ("      </xs:choice>", substring, "test#14");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#15", "    </xs:complexType>", substring);
+                       Assert.AreEqual ("    </xs:complexType>", substring, "test#15");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
-                       AssertEquals ("test#16", "  </xs:element>", substring);
+                       Assert.AreEqual ("  </xs:element>", substring, "test#16");
 
-                       AssertEquals ("test#17", "</xs:schema>", TextString);
+                       Assert.AreEqual ("</xs:schema>", TextString, "test#17");
                }
 
                [Test]
-               public void WriteXmlSchema2 () {
+               public void WriteXmlSchema2 ()
+               {
                        string xml = @"<myDataSet xmlns='NetFrameWork'><myTable><id>0</id><item>item 0</item></myTable><myTable><id>1</id><item>item 1</item></myTable><myTable><id>2</id><item>item 2</item></myTable><myTable><id>3</id><item>item 3</item></myTable><myTable><id>4</id><item>item 4</item></myTable><myTable><id>5</id><item>item 5</item></myTable><myTable><id>6</id><item>item 6</item></myTable><myTable><id>7</id><item>item 7</item></myTable><myTable><id>8</id><item>item 8</item></myTable><myTable><id>9</id><item>item 9</item></myTable></myDataSet>";
                        string schema = @"<?xml version='1.0' encoding='utf-16'?>
 <xs:schema id='myDataSet' targetNamespace='NetFrameWork' xmlns:mstns='NetFrameWork' xmlns='NetFrameWork' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:msdata='urn:schemas-microsoft-com:xml-msdata' attributeFormDefault='qualified' elementFormDefault='qualified'>
@@ -3260,7 +3346,7 @@ namespace MonoTests.System.Data
                        OriginalDataSet.WriteXml (xtw);
                        string result = sw.ToString ();
 
-                       AssertEquals (xml, result);
+                       Assert.AreEqual (xml, result);
 
                        sw = new StringWriter ();
                        xtw = new XmlTextWriter (sw);
@@ -3269,11 +3355,12 @@ namespace MonoTests.System.Data
                        result = sw.ToString ();
 
                        result = result.Replace ("\r\n", "\n").Replace ('"', '\'');
-                       AssertEquals (schema.Replace ("\r\n", "\n"), result);
+                       Assert.AreEqual (schema.Replace ("\r\n", "\n"), result);
                }
 
                [Test]
-               public void WriteXmlSchema3 () {
+               public void WriteXmlSchema3 ()
+               {
                        string xmlschema = @"<?xml version=""1.0"" encoding=""utf-16""?>
 <xs:schema id=""ExampleDataSet"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"">
   <xs:element name=""ExampleDataSet"" msdata:IsDataSet=""true"" msdata:MainDataTable=""ExampleDataTable"" msdata:UseCurrentLocale=""true"">
@@ -3310,12 +3397,13 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       AssertEquals (xmlschema.Replace ("\r\n", "\n"), result.Replace ("\r\n", "\n"));
-                       //AssertEquals (xmlschema, result.Replace ("\r\n", "\n"));
+                       Assert.AreEqual (xmlschema.Replace ("\r\n", "\n"), result.Replace ("\r\n", "\n"));
+                       //Assert.AreEqual (xmlschema, result.Replace ("\r\n", "\n"));
                }
 
                [Test]
-               public void WriteXmlSchema4 () {
+               public void WriteXmlSchema4 ()
+               {
                        string xmlschema = @"<?xml version=""1.0"" encoding=""utf-16""?>
 <xs:schema id=""Example"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"">
   <xs:element name=""Example"" msdata:IsDataSet=""true"" msdata:MainDataTable=""MyType"" msdata:UseCurrentLocale=""true"">
@@ -3351,11 +3439,12 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       AssertEquals (xmlschema.Replace ("\r\n", "\n"), result.Replace ("\r\n", "\n"));
+                       Assert.AreEqual (xmlschema.Replace ("\r\n", "\n"), result.Replace ("\r\n", "\n"));
                }
 
                [Test]
-               public void WriteXmlSchema5 () {
+               public void WriteXmlSchema5 ()
+               {
                        string xmlschema1 = @"<?xml version=""1.0"" encoding=""utf-16""?>
 <xs:schema id=""Example"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"">
   <xs:element name=""Example"" msdata:IsDataSet=""true"" msdata:MainDataTable=""StandAlone"" msdata:UseCurrentLocale=""true"">
@@ -3466,21 +3555,22 @@ namespace MonoTests.System.Data
                        StringWriter sw1 = new StringWriter ();
                        ds.Tables[0].WriteXmlSchema (sw1);
                        string result1 = sw1.ToString ();
-                       AssertEquals (xmlschema1.Replace ("\r\n", "\n"), result1.Replace ("\r\n", "\n"));
+                       Assert.AreEqual (xmlschema1.Replace ("\r\n", "\n"), result1.Replace ("\r\n", "\n"));
 
                        StringWriter sw2 = new StringWriter ();
                        ds.Tables[1].WriteXmlSchema (sw2);
                        string result2 = sw2.ToString ();
-                       AssertEquals (xmlschema2.Replace ("\r\n", "\n"), result2.Replace ("\r\n", "\n"));
+                       Assert.AreEqual (xmlschema2.Replace ("\r\n", "\n"), result2.Replace ("\r\n", "\n"));
 
                        StringWriter sw3 = new StringWriter ();
                        ds.Tables[2].WriteXmlSchema (sw3);
                        string result3 = sw3.ToString ();
-                       AssertEquals (xmlschema3.Replace ("\r\n", "\n"), result3.Replace ("\r\n", "\n"));
+                       Assert.AreEqual (xmlschema3.Replace ("\r\n", "\n"), result3.Replace ("\r\n", "\n"));
                }
 
                [Test]
-               public void WriteXmlSchema6 () {
+               public void WriteXmlSchema6 ()
+               {
                        string xmlschema = @"<?xml version=""1.0"" encoding=""utf-16""?>
 <xs:schema id=""Example"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"">
   <xs:element name=""Example"" msdata:IsDataSet=""true"" msdata:MainDataTable=""MyType"" msdata:UseCurrentLocale=""true"">
@@ -3517,11 +3607,12 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       AssertEquals (xmlschema.Replace ("\r\n", "\n"), result.Replace ("\r\n", "\n"));
+                       Assert.AreEqual (xmlschema.Replace ("\r\n", "\n"), result.Replace ("\r\n", "\n"));
                }
 
                [Test]
-               public void WriteXmlSchema7 () {
+               public void WriteXmlSchema7 ()
+               {
                        DataSet ds = new DataSet ();
                        DataTable dt = new DataTable ("table");
                        dt.Columns.Add ("col1");
@@ -3530,11 +3621,12 @@ namespace MonoTests.System.Data
                        dt.Rows.Add (new object[] { "foo", "bar" });
                        StringWriter sw = new StringWriter ();
                        ds.Tables[0].WriteXmlSchema (sw);
-                       Assert (sw.ToString ().IndexOf ("xmlns=\"\"") > 0);
+                       Assert.IsTrue (sw.ToString ().IndexOf ("xmlns=\"\"") > 0);
                }
 
                [Test]
-               public void WriteXmlSchema_ConstraintNameWithSpaces () {
+               public void WriteXmlSchema_ConstraintNameWithSpaces ()
+               {
                        DataSet ds = new DataSet ();
                        DataTable table1 = ds.Tables.Add ("table1");
                        DataTable table2 = ds.Tables.Add ("table2");
@@ -3554,7 +3646,8 @@ namespace MonoTests.System.Data
                }
 
                [Test]
-               public void WriteXmlSchema_ForignKeyConstraint () {
+               public void WriteXmlSchema_ForignKeyConstraint ()
+               {
                        DataSet ds1 = new DataSet ();
 
                        DataTable table1 = ds1.Tables.Add ();
@@ -3568,87 +3661,89 @@ namespace MonoTests.System.Data
                        StringWriter sw1 = new StringWriter ();
                        ds1.Tables[0].WriteXmlSchema (sw1);
                        String xml1 = sw1.ToString ();
-                       Assert ("#1", xml1.IndexOf (@"<xs:unique name=""Constraint1"">") != -1);
+                       Assert.IsTrue (xml1.IndexOf (@"<xs:unique name=""Constraint1"">") != -1, "#1");
 
                        StringWriter sw2 = new StringWriter ();
                        ds1.Tables[1].WriteXmlSchema (sw2);
                        String xml2 = sw2.ToString ();
-                       Assert ("#2", xml2.IndexOf (@"<xs:unique name=""Constraint1"">") == -1);
+                       Assert.IsTrue (xml2.IndexOf (@"<xs:unique name=""Constraint1"">") == -1, "#2");
                }
 
                [Test]
-               public void WriteXmlSchema_Relations_ForeignKeys () {
-                       MemoryStream ms1 = null;
-                       MemoryStream ms2 = null;
+               public void WriteXmlSchema_Relations_ForeignKeys ()
+               {
+                       MemoryStream ms1 = null;
+                       MemoryStream ms2 = null;
                        MemoryStream msA = null;
                        MemoryStream msB = null;
 
-                       DataSet ds1 = new DataSet ();
-
-                       DataTable table1 = ds1.Tables.Add ("Table 1");
-                       DataTable table2 = ds1.Tables.Add ("Table 2");
-
-                       DataColumn col1_1 = table1.Columns.Add ("col 1", typeof (int));
-                       DataColumn col1_2 = table1.Columns.Add ("col 2", typeof (int));
-                       DataColumn col1_3 = table1.Columns.Add ("col 3", typeof (int));
-                       DataColumn col1_4 = table1.Columns.Add ("col 4", typeof (int));
-                       DataColumn col1_5 = table1.Columns.Add ("col 5", typeof (int));
-                       DataColumn col1_6 = table1.Columns.Add ("col 6", typeof (int));
-                       DataColumn col1_7 = table1.Columns.Add ("col 7", typeof (int));
-
-                       DataColumn col2_1 = table2.Columns.Add ("col 1", typeof (int));
-                       DataColumn col2_2 = table2.Columns.Add ("col 2", typeof (int));
-                       DataColumn col2_3 = table2.Columns.Add ("col 3", typeof (int));
-                       DataColumn col2_4 = table2.Columns.Add ("col 4", typeof (int));
-                       DataColumn col2_5 = table2.Columns.Add ("col 5", typeof (int));
-                       DataColumn col2_6 = table2.Columns.Add ("col 6", typeof (int));
+                       DataSet ds1 = new DataSet ();
+
+                       DataTable table1 = ds1.Tables.Add ("Table 1");
+                       DataTable table2 = ds1.Tables.Add ("Table 2");
+
+                       DataColumn col1_1 = table1.Columns.Add ("col 1", typeof (int));
+                       DataColumn col1_2 = table1.Columns.Add ("col 2", typeof (int));
+                       DataColumn col1_3 = table1.Columns.Add ("col 3", typeof (int));
+                       DataColumn col1_4 = table1.Columns.Add ("col 4", typeof (int));
+                       DataColumn col1_5 = table1.Columns.Add ("col 5", typeof (int));
+                       DataColumn col1_6 = table1.Columns.Add ("col 6", typeof (int));
+                       DataColumn col1_7 = table1.Columns.Add ("col 7", typeof (int));
+
+                       DataColumn col2_1 = table2.Columns.Add ("col 1", typeof (int));
+                       DataColumn col2_2 = table2.Columns.Add ("col 2", typeof (int));
+                       DataColumn col2_3 = table2.Columns.Add ("col 3", typeof (int));
+                       DataColumn col2_4 = table2.Columns.Add ("col 4", typeof (int));
+                       DataColumn col2_5 = table2.Columns.Add ("col 5", typeof (int));
+                       DataColumn col2_6 = table2.Columns.Add ("col 6", typeof (int));
                        DataColumn col2_7 = table2.Columns.Add ("col 7", typeof (int));
 
-                       ds1.Relations.Add ("rel 1",
-                               new DataColumn[] { col1_1, col1_2 },
-                               new DataColumn[] { col2_1, col2_2 },
+                       ds1.Relations.Add ("rel 1",
+                               new DataColumn[] { col1_1, col1_2 },
+                               new DataColumn[] { col2_1, col2_2 },
                                false);
                        ds1.Relations.Add ("rel 2",
-                               new DataColumn[] { col1_3, col1_4 },
-                               new DataColumn[] { col2_3, col2_4 },
-                               true);
-                       table2.Constraints.Add ("fk 1",
-                               new DataColumn[] { col1_5, col1_6 },
-                               new DataColumn[] { col2_5, col2_6 });
+                               new DataColumn[] { col1_3, col1_4 },
+                               new DataColumn[] { col2_3, col2_4 },
+                               true);
+                       table2.Constraints.Add ("fk 1",
+                               new DataColumn[] { col1_5, col1_6 },
+                               new DataColumn[] { col2_5, col2_6 });
                        table1.Constraints.Add ("fk 2",
                                new DataColumn[] { col2_5, col2_6 },
                                new DataColumn[] { col1_5, col1_6 });
 
-                       table1.Constraints.Add ("pk 1", col1_7, true);
+                       table1.Constraints.Add ("pk 1", col1_7, true);
                        table2.Constraints.Add ("pk 2", col2_7, true);
 
                        ms1 = new MemoryStream ();
-                       ds1.Tables[0].WriteXmlSchema (ms1);
+                       ds1.Tables[0].WriteXmlSchema (ms1);
                        ms2 = new MemoryStream ();
                        ds1.Tables[1].WriteXmlSchema (ms2);
 
-                       msA = new MemoryStream (ms1.GetBuffer ());
-                       DataTable dtA = new DataTable ();
+                       msA = new MemoryStream (ms1.GetBuffer ());
+                       DataTable dtA = new DataTable ();
                        dtA.ReadXmlSchema (msA);
 
                        msB = new MemoryStream (ms2.GetBuffer ());
                        DataTable dtB = new DataTable ();
                        dtB.ReadXmlSchema (msB);
 
-                       AssertEquals ("#2", 3, dtA.Constraints.Count);
-                       AssertEquals ("#3", 2, dtB.Constraints.Count);
+                       Assert.AreEqual (3, dtA.Constraints.Count, "#2");
+                       Assert.AreEqual (2, dtB.Constraints.Count, "#3");
 
-                       Assert ("#5", dtA.Constraints.Contains ("pk 1"));
-                       Assert ("#6", dtA.Constraints.Contains ("Constraint1"));
-                       Assert ("#7", dtA.Constraints.Contains ("Constraint2"));
-                       Assert ("#9", dtB.Constraints.Contains ("pk 2"));
-                       Assert ("#10", dtB.Constraints.Contains ("Constraint1"));
+                       Assert.IsTrue (dtA.Constraints.Contains ("pk 1"), "#5");
+                       Assert.IsTrue (dtA.Constraints.Contains ("Constraint1"), "#6");
+                       Assert.IsTrue (dtA.Constraints.Contains ("Constraint2"), "#7");
+                       Assert.IsTrue (dtB.Constraints.Contains ("pk 2"), "#9");
+                       Assert.IsTrue (dtB.Constraints.Contains ("Constraint1"), "#10");
                }
 
                [Test]
                [Category ("NotWorking")]
-               public void WriteXmlSchema_DifferentNamespace () {
-                       string schema = @"<?xml version='1.0' encoding='utf-16'?>\n<xs:schema id='NewDataSet' targetNamespace='urn:bar' xmlns:mstns='urn:bar' xmlns='urn:bar' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:msdata='urn:schemas-microsoft-com:xml-msdata' attributeFormDefault='qualified' elementFormDefault='qualified' xmlns:app1='urn:baz' xmlns:app2='urn:foo' msdata:schemafragmentcount='3'>
+               public void WriteXmlSchema_DifferentNamespace ()
+               {
+                       string schema = @"<xs:schema id='NewDataSet' targetNamespace='urn:bar' xmlns:mstns='urn:bar' xmlns='urn:bar' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:msdata='urn:schemas-microsoft-com:xml-msdata' attributeFormDefault='qualified' elementFormDefault='qualified' xmlns:app1='urn:baz' xmlns:app2='urn:foo' msdata:schemafragmentcount='3'>
   <xs:import namespace='urn:foo' />
   <xs:import namespace='urn:baz' />
   <xs:element name='NewDataSet' msdata:IsDataSet='true' msdata:MainDataTable='urn_x003A_foo_x003A_NS1Table' msdata:UseCurrentLocale='true'>
@@ -3696,7 +3791,7 @@ namespace MonoTests.System.Data
                        xw1.QuoteChar = '\'';
                        ds.Tables[0].WriteXmlSchema (xw1);
                        string result1 = sw1.ToString ();
-                       AssertEquals ("#1", schema, result1);
+                       Assert.AreEqual (schema, result1.Replace ("\r\n", "\n"), "#1");
 
                        StringWriter sw2 = new StringWriter ();
                        XmlTextWriter xw2 = new XmlTextWriter (sw2);
@@ -3704,11 +3799,12 @@ namespace MonoTests.System.Data
                        xw2.QuoteChar = '\'';
                        ds.Tables[0].WriteXmlSchema (xw2);
                        string result2 = sw2.ToString ();
-                       AssertEquals ("#2", schema, result2);
+                       Assert.AreEqual (schema, result2.Replace ("\r\n", "\n"), "#2");
                }
 
                [Test]
-               public void WriteXmlSchema_Hierarchy () {
+               public void WriteXmlSchema_Hierarchy ()
+               {
                        DataSet ds = new DataSet ();
                        DataTable table1 = new DataTable ();
                        DataColumn idColumn = table1.Columns.Add ("ID", typeof (Int32));
@@ -3722,22 +3818,23 @@ namespace MonoTests.System.Data
                        ds.Tables.Add (table1);
                        ds.Tables.Add (table2);
                        ds.Relations.Add ("CustomerOrder",
-                           new DataColumn[] { table1.Columns[0] },
-                           new DataColumn[] { table2.Columns[1] }, true);
+                               new DataColumn[] { table1.Columns[0] },
+                               new DataColumn[] { table2.Columns[1] }, true);
 
                        StringWriter writer1 = new StringWriter ();
                        table1.WriteXmlSchema (writer1, false);
                        string expected1 = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">\n  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"Table1\" msdata:UseCurrentLocale=\"true\">\n    <xs:complexType>\n      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">\n        <xs:element name=\"Table1\">\n          <xs:complexType>\n            <xs:sequence>\n              <xs:element name=\"ID\" type=\"xs:int\" />\n              <xs:element name=\"Name\" type=\"xs:string\" minOccurs=\"0\" />\n            </xs:sequence>\n          </xs:complexType>\n        </xs:element>\n      </xs:choice>\n    </xs:complexType>\n    <xs:unique name=\"Constraint1\" msdata:PrimaryKey=\"true\">\n      <xs:selector xpath=\".//Table1\" />\n      <xs:field xpath=\"ID\" />\n    </xs:unique>\n  </xs:element>\n</xs:schema>";
-                       AssertEquals ("#1", expected1, writer1.ToString());
+                       Assert.AreEqual (expected1, writer1.ToString().Replace("\r\n", "\n"), "#1");
 
                        StringWriter writer2 = new StringWriter ();
                        table1.WriteXmlSchema (writer2, true);
                        string expected2 = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<xs:schema id=\"NewDataSet\" xmlns=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">\n  <xs:element name=\"NewDataSet\" msdata:IsDataSet=\"true\" msdata:MainDataTable=\"Table1\" msdata:UseCurrentLocale=\"true\">\n    <xs:complexType>\n      <xs:choice minOccurs=\"0\" maxOccurs=\"unbounded\">\n        <xs:element name=\"Table1\">\n          <xs:complexType>\n            <xs:sequence>\n              <xs:element name=\"ID\" type=\"xs:int\" />\n              <xs:element name=\"Name\" type=\"xs:string\" minOccurs=\"0\" />\n            </xs:sequence>\n          </xs:complexType>\n        </xs:element>\n        <xs:element name=\"Table2\">\n          <xs:complexType>\n            <xs:sequence>\n              <xs:element name=\"OrderID\" type=\"xs:int\" />\n              <xs:element name=\"CustomerID\" type=\"xs:int\" minOccurs=\"0\" />\n              <xs:element name=\"OrderDate\" type=\"xs:dateTime\" minOccurs=\"0\" />\n            </xs:sequence>\n          </xs:complexType>\n        </xs:element>\n      </xs:choice>\n    </xs:complexType>\n    <xs:unique name=\"Constraint1\" msdata:PrimaryKey=\"true\">\n      <xs:selector xpath=\".//Table1\" />\n      <xs:field xpath=\"ID\" />\n    </xs:unique>\n    <xs:unique name=\"Table2_Constraint1\" msdata:ConstraintName=\"Constraint1\" msdata:PrimaryKey=\"true\">\n      <xs:selector xpath=\".//Table2\" />\n      <xs:field xpath=\"OrderID\" />\n    </xs:unique>\n    <xs:keyref name=\"CustomerOrder\" refer=\"Constraint1\">\n      <xs:selector xpath=\".//Table2\" />\n      <xs:field xpath=\"CustomerID\" />\n    </xs:keyref>\n  </xs:element>\n</xs:schema>";
-                       AssertEquals ("#2", expected2, writer2.ToString ());
+                       Assert.AreEqual (expected2, writer2.ToString ().Replace("\r\n", "\n"), "#2");
                }
 
                [Test]
-               //[Category ("NotWorking")]
+               [Ignore ("MS behavior is far from consistent to be regarded as a reference implementation.")]
+               // See the same-named tests in DataSetTest.cs
                // WriteXmlSchema doesn't have overload wityh 2 parameters in System.Data
                // and is commented-out TWICE below
                public void ReadWriteXmlSchema()
@@ -3765,7 +3862,7 @@ namespace MonoTests.System.Data
   @"<xs:complexType name=""bookstoreType"">" +
   @"</xs:complexType>" +
   @"<xs:element name=""bookstore"" type=""bookstoreType"" />" +
-  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""bookstore"" msdata:UseCurrentLocale=""true"">" +
+  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""bookstore"" msdata:Locale=""en-US"">" +
     @"<xs:complexType>" +
       @"<xs:choice minOccurs=""0"" maxOccurs=""unbounded"">" +
     @"<xs:element ref=""bookstore"" />" +
@@ -3773,8 +3870,7 @@ namespace MonoTests.System.Data
     @"</xs:complexType>" +
   @"</xs:element>" +
 @"</xs:schema>";
-                       NUnit.Framework.Assert.AreEqual(expected1.Replace("\n", ""),
-                                                       TextString1.Replace("\r\n", "").Replace("  ", "").Replace("\n", ""), "#1");
+                       Assert.AreEqual(expected1.Replace("\n", ""), TextString1.Replace("\r\n", "").Replace("  ", "").Replace("\n", ""), "#1");
 
                        TextWriter writer2 = new StringWriter();
                        ds.Tables[1].WriteXmlSchema(writer2, false);
@@ -3791,7 +3887,7 @@ namespace MonoTests.System.Data
     @"<xs:attribute name=""bookstore_Id"" type=""xs:int"" use=""prohibited"" />" +
   @"</xs:complexType>" +
   @"<xs:element name=""book"" type=""bookType"" />" +
-  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""book"" msdata:UseCurrentLocale=""true"">" +
+  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""book"" msdata:Locale=""en-US"">" +
     @"<xs:complexType>" +
       @"<xs:choice minOccurs=""0"" maxOccurs=""unbounded"">" +
     @"<xs:element ref=""book"" />" +
@@ -3799,7 +3895,7 @@ namespace MonoTests.System.Data
     @"</xs:complexType>" +
   @"</xs:element>" +
 @"</xs:schema>";
-                       NUnit.Framework.Assert.AreEqual(expected2, TextString2.Replace("\r\n", "").Replace("  ", ""), "#2");
+                       Assert.AreEqual(expected2, TextString2.Replace("\r\n", "").Replace("  ", ""), "#2");
 
                        TextWriter writer3 = new StringWriter();
                        ds.Tables[2].WriteXmlSchema(writer3);
@@ -3815,7 +3911,7 @@ namespace MonoTests.System.Data
     @"<xs:attribute name=""book_Id"" type=""xs:int"" use=""prohibited"" />" +
   @"</xs:complexType>" +
   @"<xs:element name=""author"" type=""authorName"" />" +
-  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""author"" msdata:UseCurrentLocale=""true"">" +
+  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""author"" msdata:Locale=""en-US"">" +
     @"<xs:complexType>" +
       @"<xs:choice minOccurs=""0"" maxOccurs=""unbounded"">" +
         @"<xs:element ref=""author"" />" +
@@ -3823,7 +3919,7 @@ namespace MonoTests.System.Data
     @"</xs:complexType>" +
   @"</xs:element>" +
 @"</xs:schema>";
-                       NUnit.Framework.Assert.AreEqual(expected3, TextString3.Replace("\r\n", "").Replace("  ", ""), "#3");
+                       Assert.AreEqual(expected3, TextString3.Replace("\r\n", "").Replace("  ", ""), "#3");
 
                        TextWriter writer4 = new StringWriter();
                        ds.Tables[3].WriteXmlSchema(writer4);
@@ -3831,7 +3927,7 @@ namespace MonoTests.System.Data
                        string TextString4 = writer4.ToString();
                        string expected4 = @"<?xml version=""1.0"" encoding=""utf-16""?>" +
 @"<xs:schema id=""Root"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"">" +
-  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""Region"" msdata:UseCurrentLocale=""true"">" +
+  @"<xs:element name=""Root"" msdata:IsDataSet=""true"" msdata:MainDataTable=""Region"" msdata:Locale=""en-US"">" +
     @"<xs:complexType>" +
       @"<xs:choice minOccurs=""0"" maxOccurs=""unbounded"">" +
         @"<xs:element name=""Region"">" +
@@ -3846,12 +3942,14 @@ namespace MonoTests.System.Data
     @"</xs:complexType>" +
   @"</xs:element>" +
 @"</xs:schema>";
-                       NUnit.Framework.Assert.AreEqual(expected4, TextString4.Replace("\r\n", "").Replace("  ", ""), "#4");
+                       Assert.AreEqual(expected4, TextString4.Replace("\r\n", "").Replace("  ", ""), "#4");
                }
 
                [Test]
-               //[Category ("NotWorking")]
-               public void ReadWriteXmlSchema_IgnoreSchema () {
+               [Ignore ("MS behavior is far from consistent to be regarded as a reference implementation.")]
+               // See the same-named tests in DataSetTest.cs
+               public void ReadWriteXmlSchema_IgnoreSchema ()
+               {
                        DataSet ds = new DataSet ();
                        ds.ReadXmlSchema ("Test/System.Data/store.xsd");
                        // check dataset properties before testing write
@@ -3884,68 +3982,68 @@ namespace MonoTests.System.Data
   @"</xs:element>" +
 @"</xs:schema>";
                        Console.WriteLine ("{0} - {1}", TextString1, expected1);
-                       AssertEquals ("#1", expected1, TextString1.Replace ("\r\n", "").Replace ("  ", "").Replace ("\n", ""));
+                       Assert.AreEqual (expected1, TextString1.Replace ("\r\n", "").Replace ("  ", "").Replace ("\n", ""), "#1");
 
                        TextWriter writer2 = new StringWriter ();
                        ds.Tables[1].WriteXmlSchema (writer2, false);
                        string TextString2 = GetNormalizedSchema (writer2.ToString ());
                        string expected2 = @"<?xml version=""1.0"" encoding=""utf-16""?>" +
-@"<xs:schema id=""NewDataSet"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"">" +
+@"<xs:schema id=""NewDataSet"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">" +
   @"<xs:complexType name=""bookType"">" +
     @"<xs:sequence>" +
-      @"<xs:element name=""title"" type=""xs:string"" msdata:Ordinal=""1"" />" +
-      @"<xs:element name=""price"" type=""xs:decimal"" msdata:Ordinal=""2"" />" +
+      @"<xs:element msdata:Ordinal=""1"" name=""title"" type=""xs:string"" />" +
+      @"<xs:element msdata:Ordinal=""2"" name=""price"" type=""xs:decimal"" />" +
     @"</xs:sequence>" +
     @"<xs:attribute name=""genre"" type=""xs:string"" />" +
     @"<xs:attribute name=""bookstore_Id"" type=""xs:int"" use=""prohibited"" />" +
   @"</xs:complexType>" +
   @"<xs:element name=""book"" type=""bookType"" />" +
-  @"<xs:element name=""NewDataSet"" msdata:IsDataSet=""true"" msdata:MainDataTable=""book"" msdata:UseCurrentLocale=""true"">" +
+  @"<xs:element msdata:IsDataSet=""true"" msdata:MainDataTable=""book"" msdata:UseCurrentLocale=""true"" name=""NewDataSet"">" +
     @"<xs:complexType>" +
-      @"<xs:choice minOccurs=""0"" maxOccurs=""unbounded"">" +
+      @"<xs:choice maxOccurs=""unbounded"" minOccurs=""0"">" +
        @"<xs:element ref=""book"" />" +
       @"</xs:choice>" +
     @"</xs:complexType>" +
   @"</xs:element>" +
 @"</xs:schema>";
-                       AssertEquals ("#2", expected2, TextString2.Replace ("\r\n", "").Replace ("  ", ""));
+                       Assert.AreEqual (expected2, TextString2.Replace ("\r\n", "").Replace ("  ", ""), "#2");
 
                        TextWriter writer3 = new StringWriter ();
                        ds.Tables[2].WriteXmlSchema (writer3);
                        string TextString3 = GetNormalizedSchema (writer3.ToString ());
                        string expected3 = @"<?xml version=""1.0"" encoding=""utf-16""?>" +
-@"<xs:schema id=""NewDataSet"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"">" +
+@"<xs:schema id=""NewDataSet"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">" +
   @"<xs:complexType name=""authorName"">" +
     @"<xs:sequence>" +
-      @"<xs:element name=""first-name"" type=""xs:string"" msdata:Ordinal=""0"" />" +
-      @"<xs:element name=""last-name"" type=""xs:string"" msdata:Ordinal=""1"" />" +
+      @"<xs:element msdata:Ordinal=""0"" name=""first-name"" type=""xs:string"" />" +
+      @"<xs:element msdata:Ordinal=""1"" name=""last-name"" type=""xs:string"" />" +
     @"</xs:sequence>" +
     @"<xs:attribute name=""book_Id"" type=""xs:int"" use=""prohibited"" />" +
   @"</xs:complexType>" +
   @"<xs:element name=""author"" type=""authorName"" />" +
-  @"<xs:element name=""NewDataSet"" msdata:IsDataSet=""true"" msdata:MainDataTable=""author"" msdata:UseCurrentLocale=""true"">" +
+  @"<xs:element msdata:IsDataSet=""true"" msdata:MainDataTable=""author"" msdata:UseCurrentLocale=""true"" name=""NewDataSet"">" +
     @"<xs:complexType>" +
-      @"<xs:choice minOccurs=""0"" maxOccurs=""unbounded"">" +
+      @"<xs:choice maxOccurs=""unbounded"" minOccurs=""0"">" +
        @"<xs:element ref=""author"" />" +
       @"</xs:choice>" +
     @"</xs:complexType>" +
   @"</xs:element>" +
 @"</xs:schema>";
-                       AssertEquals ("#3", expected3, TextString3.Replace ("\r\n", "").Replace ("  ", ""));
+                       Assert.AreEqual (expected3, TextString3.Replace ("\r\n", "").Replace ("  ", ""), "#3");
 
                        TextWriter writer4 = new StringWriter ();
-                       string expStr = "";
+
                        try {
-                               ds.Tables[3].WriteXmlSchema (writer4);
+                               ds.Tables [3].WriteXmlSchema (writer4);
+                               Assert.Fail ("expected exception");
+                       } catch (InvalidOperationException ex) {
+                               throw ex;
                        }
-                       catch (Exception ex) {
-                               expStr = ex.Message;
-                       }
-                       AssertEquals ("#4", "Cannot find table 3.", expStr);
                }
 
                [Test]
-               public void ReadWriteXmlSchema_2 () {
+               public void ReadWriteXmlSchema_2 ()
+               {
                        DataSet ds = new DataSet ("dataset");
                        ds.Tables.Add ("table1");
                        ds.Tables.Add ("table2");
@@ -3964,62 +4062,74 @@ namespace MonoTests.System.Data
                        ds1.Tables[0].ReadXmlSchema (new MemoryStream (ms1.GetBuffer ()));
                        ds1.Tables[1].ReadXmlSchema (new MemoryStream (ms2.GetBuffer ()));
 
-                       AssertEquals ("#1", 0, ds1.Relations.Count);
-                       AssertEquals ("#2", 1, ds1.Tables[0].Columns.Count);
-                       AssertEquals ("#3", 1, ds1.Tables[1].Columns.Count);
+                       Assert.AreEqual (0, ds1.Relations.Count, "#1");
+                       Assert.AreEqual (1, ds1.Tables[0].Columns.Count, "#2");
+                       Assert.AreEqual (1, ds1.Tables[1].Columns.Count, "#3");
                }
 
                [Test]
-               [ExpectedException (typeof (XmlException))]
-               public void ReadWriteXmlSchemaExp_NoRootElmnt () {
+               public void ReadWriteXmlSchemaExp_NoRootElmnt ()
+               {
                        MemoryStream ms = new MemoryStream ();
                        DataTable dtr = new DataTable ();
-                       dtr.ReadXmlSchema (ms);
+                       try {
+                               dtr.ReadXmlSchema (ms);
+                               Assert.Fail ("#1");
+                       } catch (XmlException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (InvalidOperationException))]
-               public void ReadWriteXmlSchemaExp_NoTableName () {
+               public void ReadWriteXmlSchemaExp_NoTableName ()
+               {
                        DataTable dtw = new DataTable ();
                        MemoryStream ms = new MemoryStream ();
-                       dtw.WriteXmlSchema (ms);
+                       try {
+                               dtw.WriteXmlSchema (ms);
+                               Assert.Fail ("#1");
+                       } catch (InvalidOperationException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void ReadWriteXmlSchemaExp_NoFileName () {
+               public void ReadWriteXmlSchemaExp_NoFileName ()
+               {
                        DataTable dtw = new DataTable ();
-                       dtw.WriteXmlSchema ("");
+                       try {
+                               dtw.WriteXmlSchema (string.Empty);
+                               Assert.Fail ("#1");
+                       } catch (ArgumentException) {
+                       }
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void ReadWriteXmlSchemaExp_TableNameConflict () {
+               public void ReadWriteXmlSchemaExp_TableNameConflict ()
+               {
                        DataTable dtw = new DataTable ("Table1");
                        StringWriter writer1 = new StringWriter ();
                        dtw.WriteXmlSchema (writer1);
                        DataTable dtr = new DataTable ("Table2");
                        StringReader reader1 = new StringReader (writer1.ToString());
-                       dtr.ReadXmlSchema (reader1);
+                       try {
+                               dtr.ReadXmlSchema (reader1);
+                               Assert.Fail ("#1");
+                       } catch (ArgumentException) {
+                       }
                }
 
                #endregion // Read/Write XML Tests
 
-#endif // NET_2_0
+       }
+
+       public  class MyDataTable : DataTable
+       {
+               public static int count = 0;
 
+               public MyDataTable()
+               {
+                       count++;
+               }
        }
-                                                                                                    
-                                                                                                    
-         public  class MyDataTable:DataTable {
-                                                                                                    
-             public static int count = 0;
-                                                                                                    
-             public MyDataTable() {
-                                                                                                    
-                    count++;
-             }
-                                                                                                    
-         }
 
        [Serializable]
        [TestFixture]
@@ -4028,13 +4138,15 @@ namespace MonoTests.System.Data
                public void Remote ()
                {
                        int n = (int) Convert.ChangeType ("5", typeof (int));
-                       Assertion.AssertEquals ("n", 5, n);
+                       Assert.AreEqual (5, n, "n");
                }
-#if !TARGET_JVM
+
+#if !MONOTOUCH
                [Test]
                public void NFIFromBug55978 ()
                {
-                       AppDomain domain = AppDomain.CreateDomain ("testdomain");
+                       AppDomain domain = AppDomain.CreateDomain ("testdomain", null,
+                               AppDomain.CurrentDomain.SetupInformation);
                        AppDomainsAndFormatInfo test = new AppDomainsAndFormatInfo ();
                        test.Remote ();
                        domain.DoCallBack (new CrossAppDomainDelegate (test.Remote));
@@ -4058,9 +4170,41 @@ namespace MonoTests.System.Data
                        }
         
                        DataView dv = dt.DefaultView;
-                       dv.RowFilter = "StartDate >= '" + DateTime.Now.AddDays (2) + "' and StartDate <= '" + DateTime.Now.AddDays (4) + "'";
-                       Assertion.AssertEquals ("Table", 10, dt.Rows.Count);
-                       Assertion.AssertEquals ("View", 2, dv.Count);
+                       dv.RowFilter = String.Format (CultureInfo.InvariantCulture,
+                                                     "StartDate >= '{0}' and StartDate <= '{1}'",
+                                                     DateTime.Now.AddDays (2),
+                                                     DateTime.Now.AddDays (4));
+                       Assert.AreEqual (10, dt.Rows.Count, "Table");
+                       Assert.AreEqual (2, dv.Count, "View");
+               }
+
+               [Test]
+               public void Bug82109 ()
+               {
+                       DataTable tbl = new DataTable ();
+                       tbl.Columns.Add ("data", typeof (DateTime));
+                       DataRow row = tbl.NewRow ();
+                       row ["Data"] = new DateTime (2007, 7, 1);
+                       tbl.Rows.Add (row);
+
+                       CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
+                       Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+                       Select (tbl);
+
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo ("it-IT");
+                       Select (tbl);
+
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo ("fr-FR");
+                       Select (tbl);
+                       Thread.CurrentThread.CurrentCulture = currentCulture;
+               }
+
+               private static void Select (DataTable tbl)
+               {
+                       tbl.Locale = CultureInfo.InvariantCulture;
+                       string filter = string.Format ("Data = '{0}'", new DateTime (2007, 7, 1).ToString (CultureInfo.InvariantCulture));
+                       DataRow [] rows = tbl.Select (filter);
+                       Assert.AreEqual (1, rows.Length, "Incorrect number of rows found");
                }
        }
 }